changeset 16503:17f5563d1285 v8.1.1255

patch 8.1.1255: building desktop files fails on FreeBSD commit https://github.com/vim/vim/commit/12e91862c14a1af44b537d478e8a5021893044fe Author: Bram Moolenaar <Bram@vim.org> Date: Fri May 3 21:20:03 2019 +0200 patch 8.1.1255: building desktop files fails on FreeBSD Problem: Building desktop files fails on FreeBSD. (Adam Weinberger) Solution: Avoid using non-portable construct in Makefile. (closes https://github.com/vim/vim/issues/4332)
author Bram Moolenaar <Bram@vim.org>
date Fri, 03 May 2019 21:30:05 +0200
parents 1a046ff2f5fb
children d70715c33e4f
files src/po/Makefile src/version.c
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -165,9 +165,13 @@ checkclean:
 		po/gvim.desktop.in po/vim.desktop.in
 	mv -f ../$(PACKAGE).po $(PACKAGE).pot
 
-%.desktop: %.desktop.in $(POFILES)
+vim.desktop: vim.desktop.in $(POFILES)
 	@echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
-	$(MSGFMT) --desktop -d . --template $< -o $@
+	$(MSGFMT) --desktop -d . --template vim.desktop.in -o vim.desktop
+
+gvim.desktop: gvim.desktop.in $(POFILES)
+	@echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
+	$(MSGFMT) --desktop -d . --template gvim.desktop.in -o gvim.desktop
 
 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 */
 /**/
+    1255,
+/**/
     1254,
 /**/
     1253,