Mercurial > vim
changeset 7200:bc951043f655 v7.4.909
commit https://github.com/vim/vim/commit/de59ba33aa3b94f2757dbf3451682d762c15ebcf
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Nov 3 22:03:16 2015 +0100
patch 7.4.909
Problem: "make install" fails.
Solution: Only try installing desktop files if the destination directory
exists.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 03 Nov 2015 22:15:04 +0100 |
| parents | 799095feea6d |
| children | 5fe47f21f158 |
| files | src/Makefile src/version.c |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -2213,6 +2213,7 @@ install-languages: languages $(DEST_LANG ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps +DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications KDEPATH = $(HOME)/.kde/share/icons install-icons: if test -d $(ICON48PATH) -a -w $(ICON48PATH) \ @@ -2227,8 +2228,11 @@ install-icons: -a ! -f $(ICON16PATH)/gvim.png; then \ $(INSTALL_DATA) $(SCRIPTSOURCE)/vim16x16.png $(ICON16PATH)/gvim.png; \ fi - $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop $(SCRIPTSOURCE)/gvim.desktop \ - $(DESTDIR)$(DATADIR)/applications + if test -d $(DESKTOPPATH) -a -w $(DESKTOPPATH); then \ + $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \ + $(SCRIPTSOURCE)/gvim.desktop \ + $(DESKTOPPATH); \ + fi $(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE): @echo Runtime files not found.