summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-22 10:14:07 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-22 10:14:07 +0200
commit54a38415caa31de8b4ac46a9234ae339b1fd6255 (patch)
tree581c080f77eba76ecabe950f20fe57c138b95b10
parent21decdd3e6d5ce3469a3c2743de1f4aada388d8c (diff)
downloadvim-git-54a38415caa31de8b4ac46a9234ae339b1fd6255.tar.gz
patch 7.4.1772v7.4.1772
Problem: Installation fails when $GTK_UPDATE_ICON_CACHE is empty. Solution: Add quotes. (Kazunobu Kuriyama)
-rw-r--r--src/Makefile4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile
index 69e3a4b9f..716dae701 100644
--- 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 725d77472..77d011705 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1772,
+/**/
1771,
/**/
1770,