Skip to content

Commit 7683aaa

Browse files
committed
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)
1 parent cb03397 commit 7683aaa

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

src/Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2457,14 +2457,20 @@ install-languages: languages $(DEST_LANG) $(DEST_KMAP)
24572457
chmod $(FILEMOD) $(DEST_KMAP)/README.txt $(DEST_KMAP)/*.vim; \
24582458
fi
24592459

2460-
# install the icons for KDE, if the directory exists and the icon doesn't.
2460+
# Install the icons for KDE, if the directory exists and the icon doesn't.
2461+
# Always when $(DESTDIR) is not empty.
24612462
ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps
24622463
ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps
24632464
ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps
24642465
ICONTHEMEPATH = $(DATADIR)/icons/hicolor
24652466
DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications
24662467
KDEPATH = $(HOME)/.kde/share/icons
24672468
install-icons:
2469+
if test -n "$(DESTDIR)"; then \
2470+
$(SHELL) ./mkinstalldirs $(ICON48PATH) $(ICON32PATH) \
2471+
$(ICON16PATH) $(DESKTOPPATH); \
2472+
fi
2473+
24682474
if test -d $(ICON48PATH) -a -w $(ICON48PATH) \
24692475
-a ! -f $(ICON48PATH)/gvim.png; then \
24702476
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim48x48.png $(ICON48PATH)/gvim.png; \

src/version.c

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

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
2289,
766768
/**/
767769
2288,
768770
/**/

0 commit comments

Comments
 (0)