# HG changeset patch # User Christian Brabandt # Date 1461312906 -7200 # Node ID 887bded0d8eae3e28fa01041c4c861321191cc7f # Parent 3dc3e63c60c439ad79079e4b4f4de2486aac5fdd commit https://github.com/vim/vim/commit/54a38415caa31de8b4ac46a9234ae339b1fd6255 Author: Bram Moolenaar Date: Fri Apr 22 10:14:07 2016 +0200 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 --- 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 --- 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,