Mercurial > vim
changeset 10034:0b57c032e9b0 v7.4.2289
commit https://github.com/vim/vim/commit/7683aaa5061e26d4bc52fdf40be66789e9e4fec0
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Aug 28 21:00:50 2016 +0200
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 28 Aug 2016 21:15:06 +0200 |
| parents | 0c0cdd226cf3 |
| children | baaad4690bfb |
| files | src/Makefile src/version.c |
| diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -2457,7 +2457,8 @@ install-languages: languages $(DEST_LANG 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; \