diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-11-03 22:03:16 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-11-03 22:03:16 +0100 |
| commit | de59ba33aa3b94f2757dbf3451682d762c15ebcf (patch) | |
| tree | a3b3676afd4145aab875ca23ed7dd2d2e6dab6e5 | |
| parent | a16f472edfa028e5574c7c145d02f3821edbc698 (diff) | |
| download | vim-git-7.4.909.tar.gz | |
patch 7.4.909v7.4.909
Problem: "make install" fails.
Solution: Only try installing desktop files if the destination directory
exists.
| -rw-r--r-- | src/Makefile | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 60d26c023..90b2f0cee 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2213,6 +2213,7 @@ install-languages: languages $(DEST_LANG) $(DEST_KMAP) 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. diff --git a/src/version.c b/src/version.c index ade4e962b..73713feac 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 909, +/**/ 908, /**/ 907, |