patch 7.4.1772

Problem:    Installation fails when $GTK_UPDATE_ICON_CACHE is empty.
Solution:   Add quotes. (Kazunobu Kuriyama)

diff --git a/src/Makefile b/src/Makefile
index 69e3a4b9f7852b352b21afb5ec4a8fa4edbcbc87..716dae701ee86a4ef7b5d4aa94304119073f4c43 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2363,7 +2363,7 @@ install-icons:
        if test -d $(ICON48PATH) -a -w $(ICON48PATH) \
                -a ! -f $(ICON48PATH)/gvim.png; then \
           $(INSTALL_DATA) $(SCRIPTSOURCE)/vim48x48.png $(ICON48PATH)/gvim.png; \
-          if test -z "$(DESTDIR)" -a -x $(GTK_UPDATE_ICON_CACHE) \
+          if test -z "$(DESTDIR)" -a -x "$(GTK_UPDATE_ICON_CACHE)" \
                   -a -w $(ICONTHEMEPATH) \
                   -a -f $(ICONTHEMEPATH)/index.theme; then \
                $(GTK_UPDATE_ICON_CACHE) -q $(ICONTHEMEPATH); \
@@ -2381,7 +2381,7 @@ install-icons:
           $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \
                $(SCRIPTSOURCE)/gvim.desktop \
                $(DESKTOPPATH); \
-          if test -z "$(DESTDIR)" -a -x $(UPDATE_DESKTOP_DATABASE); then \
+          if test -z "$(DESTDIR)" -a -x "$(UPDATE_DESKTOP_DATABASE)"; then \
              $(UPDATE_DESKTOP_DATABASE) -q $(DESKTOPPATH); \
           fi \
        fi

diff --git a/src/version.c b/src/version.c
index 725d77472af03ff82b21cfe5cdcb61653e7190e4..77d0117055afac723a834ba0163f57ecf4f08a66 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1772,
 /**/
     1771,
 /**/