Mercurial > vim

changeset 36018:981bb25989d0 v9.1.0687

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0687: Makefile may not install desktop files Commit: https://github.com/vim/vim/commit/dabf07e4580b0e378741b3e11b5989e4f0cf17e0 Author: Christian Brabandt <cb@256bit.org> Date: Thu Aug 22 21:20:15 2024 +0200 patch 9.1.0687: Makefile may not install desktop files Problem: Makefile may not install desktop files Solution: Check for "$(DESTDIR)$(DATADIR)" instead of just "$DESTDIR", which is usually not defined, add uninstall rules for the icons and the desktop files closes: #15528 fixes: #15546 Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Thu, 22 Aug 2024 21:30:04 +0200
parents 2ce38720e556
children e7291f1eae4d
files src/Makefile src/version.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile
+++ b/src/Makefile
@@ -2624,7 +2624,7 @@ ICONTHEMEPATH = $(DATADIR)/icons/hicolor
 DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications
 KDEPATH = $(HOME)/.kde/share/icons
 install-icons:
-	if test -n "$(DESTDIR)"; then \
+	if test -n "$(DESTDIR)$(DATADIR)"; then \
 		$(MKDIR_P) $(ICON48PATH) $(ICON32PATH) \
 		$(ICON16PATH) $(DESKTOPPATH); \
 	fi
@@ -2845,6 +2845,8 @@ uninstall_runtime:
 	-rm -f $(SYS_OPTWIN_FILE)
 	-rm -f $(DEST_COL)/*.vim $(DEST_COL)/README.txt
 	-rm -rf $(DEST_COL)/tools
+	-rm -f $(DESKTOPPATH)/vim.desktop $(DESKTOPPATH)/gvim.desktop
+	-rm -f $(ICON16PATH)/gvim.png $(ICON32PATH)/gvim.png $(ICON48PATH)/gvim.png
 	-rm -rf $(DEST_COL)/lists
 	-rm -f $(DEST_SYN)/shared/*.vim $(DEST_SYN)/shared/README.txt
 	-rm -f $(DEST_SYN)/modula2/opt/*.vim
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    687,
+/**/
     686,
 /**/
     685,