patch 7.4.2289
Problem: When installing and $DESTDIR is set the icons probably won't be
installed.
Solution: Create the icon directories if $DESTDIR is not empty. (Danek
Duvall)
diff --git a/src/Makefile b/src/Makefile
index f93a76f..70f717e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2457,7 +2457,8 @@
chmod $(FILEMOD) $(DEST_KMAP)/README.txt $(DEST_KMAP)/*.vim; \
fi
-# install the icons for KDE, if the directory exists and the icon doesn't.
+# Install the icons for KDE, if the directory exists and the icon doesn't.
+# Always when $(DESTDIR) is not empty.
ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps
ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps
ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps
@@ -2465,6 +2466,11 @@
DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications
KDEPATH = $(HOME)/.kde/share/icons
install-icons:
+ if test -n "$(DESTDIR)"; then \
+ $(SHELL) ./mkinstalldirs $(ICON48PATH) $(ICON32PATH) \
+ $(ICON16PATH) $(DESKTOPPATH); \
+ fi
+
if test -d $(ICON48PATH) -a -w $(ICON48PATH) \
-a ! -f $(ICON48PATH)/gvim.png; then \
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim48x48.png $(ICON48PATH)/gvim.png; \
diff --git a/src/version.c b/src/version.c
index 1de38c8..b67c3f6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2289,
+/**/
2288,
/**/
2287,