Skip to content

Commit de59ba3

Browse files
committed
patch 7.4.909
Problem: "make install" fails. Solution: Only try installing desktop files if the destination directory exists.
1 parent a16f472 commit de59ba3

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2213,6 +2213,7 @@ install-languages: languages $(DEST_LANG) $(DEST_KMAP)
22132213
ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps
22142214
ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps
22152215
ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps
2216+
DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications
22162217
KDEPATH = $(HOME)/.kde/share/icons
22172218
install-icons:
22182219
if test -d $(ICON48PATH) -a -w $(ICON48PATH) \
@@ -2227,8 +2228,11 @@ install-icons:
22272228
-a ! -f $(ICON16PATH)/gvim.png; then \
22282229
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim16x16.png $(ICON16PATH)/gvim.png; \
22292230
fi
2230-
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop $(SCRIPTSOURCE)/gvim.desktop \
2231-
$(DESTDIR)$(DATADIR)/applications
2231+
if test -d $(DESKTOPPATH) -a -w $(DESKTOPPATH); then \
2232+
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \
2233+
$(SCRIPTSOURCE)/gvim.desktop \
2234+
$(DESKTOPPATH); \
2235+
fi
22322236

22332237
$(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE):
22342238
@echo Runtime files not found.

src/version.c

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

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
909,
744746
/**/
745747
908,
746748
/**/

0 commit comments

Comments
 (0)