patch 9.1.0687: Makefile may not install desktop files
Commit:
https://github.com/vim/vim/commit/dabf07e4580b0e378741b3e11b5989e4f0cf17e0
Author: Christian Brabandt <c...@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 <c...@256bit.org>
diff --git a/src/Makefile b/src/Makefile
index 2da0c6f4a..875a0de6a 100644
--- 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
diff --git a/src/version.c b/src/version.c
index 0aa9683eb..72cce6580 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 687,
/**/
686,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1shDVU-001Lhg-G5%40256bit.org.
