mirror of
https://github.com/vim/vim.git
synced 2025-10-08 06:04:08 -04:00
patch 7.4.909
Problem: "make install" fails. Solution: Only try installing desktop files if the destination directory exists.
This commit is contained in:
@@ -2213,6 +2213,7 @@ install-languages: languages $(DEST_LANG) $(DEST_KMAP)
|
|||||||
ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps
|
ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps
|
||||||
ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps
|
ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps
|
||||||
ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps
|
ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps
|
||||||
|
DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications
|
||||||
KDEPATH = $(HOME)/.kde/share/icons
|
KDEPATH = $(HOME)/.kde/share/icons
|
||||||
install-icons:
|
install-icons:
|
||||||
if test -d $(ICON48PATH) -a -w $(ICON48PATH) \
|
if test -d $(ICON48PATH) -a -w $(ICON48PATH) \
|
||||||
@@ -2227,8 +2228,11 @@ install-icons:
|
|||||||
-a ! -f $(ICON16PATH)/gvim.png; then \
|
-a ! -f $(ICON16PATH)/gvim.png; then \
|
||||||
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim16x16.png $(ICON16PATH)/gvim.png; \
|
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim16x16.png $(ICON16PATH)/gvim.png; \
|
||||||
fi
|
fi
|
||||||
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop $(SCRIPTSOURCE)/gvim.desktop \
|
if test -d $(DESKTOPPATH) -a -w $(DESKTOPPATH); then \
|
||||||
$(DESTDIR)$(DATADIR)/applications
|
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \
|
||||||
|
$(SCRIPTSOURCE)/gvim.desktop \
|
||||||
|
$(DESKTOPPATH); \
|
||||||
|
fi
|
||||||
|
|
||||||
$(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE):
|
$(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE):
|
||||||
@echo Runtime files not found.
|
@echo Runtime files not found.
|
||||||
|
@@ -741,6 +741,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
909,
|
||||||
/**/
|
/**/
|
||||||
908,
|
908,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user