# HG changeset patch # User Christian Brabandt # Date 1446585304 -3600 # Node ID bc951043f655085985857d4b81ac9cf458eeab91 # Parent 799095feea6d4bb5a1dc2c824dbde3ec2d743d5b commit https://github.com/vim/vim/commit/de59ba33aa3b94f2757dbf3451682d762c15ebcf Author: Bram Moolenaar Date: Tue Nov 3 22:03:16 2015 +0100 patch 7.4.909 Problem: "make install" fails. Solution: Only try installing desktop files if the destination directory exists. diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -2213,6 +2213,7 @@ install-languages: languages $(DEST_LANG ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps +DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications KDEPATH = $(HOME)/.kde/share/icons install-icons: if test -d $(ICON48PATH) -a -w $(ICON48PATH) \ @@ -2227,8 +2228,11 @@ install-icons: -a ! -f $(ICON16PATH)/gvim.png; then \ $(INSTALL_DATA) $(SCRIPTSOURCE)/vim16x16.png $(ICON16PATH)/gvim.png; \ fi - $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop $(SCRIPTSOURCE)/gvim.desktop \ - $(DESTDIR)$(DATADIR)/applications + if test -d $(DESKTOPPATH) -a -w $(DESKTOPPATH); then \ + $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \ + $(SCRIPTSOURCE)/gvim.desktop \ + $(DESKTOPPATH); \ + fi $(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE): @echo Runtime files not found. diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 909, +/**/ 908, /**/ 907,