Mercurial > vim

changeset 16473:a474f2cd3448 v8.1.1240

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1240: runtime desktop files are overwritten by build commit https://github.com/vim/vim/commit/d96dbd6f95ea22f609042cc9c6272f14a21ff1a5 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Apr 30 21:27:34 2019 +0200 patch 8.1.1240: runtime desktop files are overwritten by build Problem: Runtime desktop files are overwritten by build. (Tony Mechelynck) Solution: Instead of copying the files find them with "make install".
author Bram Moolenaar <Bram@vim.org>
date Tue, 30 Apr 2019 21:30:06 +0200
parents 4f8d09a2f7d9
children a85112628edc
files src/Makefile src/po/Makefile src/version.c
diffstat 3 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile
+++ b/src/Makefile
@@ -2556,9 +2556,14 @@ install-icons:
 	   $(INSTALL_DATA) $(SCRIPTSOURCE)/vim16x16.png $(ICON16PATH)/gvim.png; \
 	fi
 	if test -d $(DESKTOPPATH) -a -w $(DESKTOPPATH); then \
-	   $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \
-		$(SCRIPTSOURCE)/gvim.desktop \
-		$(DESKTOPPATH); \
+	   if test -f po/vim.desktop -a -f po/gvim.desktop; then \
+		$(INSTALL_DATA) po/vim.desktop po/gvim.desktop \
+			$(DESKTOPPATH); \
+	   else \
+		$(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \
+			$(SCRIPTSOURCE)/gvim.desktop \
+			$(DESKTOPPATH); \
+	   fi; \
 	   if test -z "$(DESTDIR)" -a -x "$(UPDATE_DESKTOP_DATABASE)"; then \
 	      $(UPDATE_DESKTOP_DATABASE) -q $(DESKTOPPATH); \
 	   fi \
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -168,7 +168,6 @@ checkclean:
 %.desktop: %.desktop.in $(POFILES)
 	@echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
 	$(MSGFMT) --desktop -d . --template $< -o $@
-	cp -f $@ ../../runtime/$@
 
 update-po: $(LANGUAGES)
 
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1240,
+/**/
     1239,
 /**/
     1238,