From 7683aaa5061e26d4bc52fdf40be66789e9e4fec0 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 28 Aug 2016 21:00:50 +0200
Subject: 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)

---
 src/Makefile  | 8 +++++++-
 src/version.c | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index f93a76f22..70f717ef3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2457,7 +2457,8 @@ install-languages: languages $(DEST_LANG) $(DEST_KMAP)
 	   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 @@ ICONTHEMEPATH = $(DATADIR)/icons/hicolor
 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 1de38c80c..b67c3f60c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2289,
 /**/
     2288,
 /**/
-- 
cgit v1.2.1