0
0
mirror of https://github.com/vim/vim.git synced 2025-10-09 06:14:17 -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:
Bram Moolenaar
2015-11-03 22:03:16 +01:00
parent a16f472edf
commit de59ba33aa
2 changed files with 8 additions and 2 deletions

View File

@@ -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.

View File

@@ -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,
/**/ /**/