patch 7.4.909
Problem: "make install" fails.
Solution: Only try installing desktop files if the destination directory
exists.
diff --git a/src/Makefile b/src/Makefile
index 60d26c0..90b2f0c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2213,6 +2213,7 @@
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 @@
-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.