Skip to content

Commit 54a3841

Browse files
committed
patch 7.4.1772
Problem: Installation fails when $GTK_UPDATE_ICON_CACHE is empty. Solution: Add quotes. (Kazunobu Kuriyama)
1 parent 21decdd commit 54a3841

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2363,7 +2363,7 @@ install-icons:
23632363
if test -d $(ICON48PATH) -a -w $(ICON48PATH) \
23642364
-a ! -f $(ICON48PATH)/gvim.png; then \
23652365
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim48x48.png $(ICON48PATH)/gvim.png; \
2366-
if test -z "$(DESTDIR)" -a -x $(GTK_UPDATE_ICON_CACHE) \
2366+
if test -z "$(DESTDIR)" -a -x "$(GTK_UPDATE_ICON_CACHE)" \
23672367
-a -w $(ICONTHEMEPATH) \
23682368
-a -f $(ICONTHEMEPATH)/index.theme; then \
23692369
$(GTK_UPDATE_ICON_CACHE) -q $(ICONTHEMEPATH); \
@@ -2381,7 +2381,7 @@ install-icons:
23812381
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \
23822382
$(SCRIPTSOURCE)/gvim.desktop \
23832383
$(DESKTOPPATH); \
2384-
if test -z "$(DESTDIR)" -a -x $(UPDATE_DESKTOP_DATABASE); then \
2384+
if test -z "$(DESTDIR)" -a -x "$(UPDATE_DESKTOP_DATABASE)"; then \
23852385
$(UPDATE_DESKTOP_DATABASE) -q $(DESKTOPPATH); \
23862386
fi \
23872387
fi

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,8 @@ static char *(features[]) =
753753

754754
static int included_patches[] =
755755
{ /* Add new patch number below this line */
756+
/**/
757+
1772,
756758
/**/
757759
1771,
758760
/**/

0 commit comments

Comments
 (0)