forked from aniani/vim
patch 7.4.1772
Problem: Installation fails when $GTK_UPDATE_ICON_CACHE is empty. Solution: Add quotes. (Kazunobu Kuriyama)
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -753,6 +753,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1772,
|
||||
/**/
|
||||
1771,
|
||||
/**/
|
||||
|
||||
Reference in New Issue
Block a user