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
index 60d26c023c5be7317042446c360ff869c129775b..90b2f0cee79c06edb28851eff7148024c51a375d 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2213,6 +2213,7 @@ install-languages: languages $(DEST_LANG) $(DEST_KMAP)
 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
index ade4e962bc8323d37a6cbebf4a7f19d7c16e91db..73713feacfdfeef74096e98e6f9fd0c185aad89e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    909,
 /**/
     908,
 /**/