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 #4332)

diff --git a/src/po/Makefile b/src/po/Makefile
index 7c03fe4a748dc66febee50e27f6bbeea38529b21..cc56b83d2e2dbb472be93ecf9d884e7fa3a63323 100644 (file)
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -165,9 +165,13 @@ $(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h ../if_p
                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)
 

diff --git a/src/version.c b/src/version.c
index 0882fa267a5cd96efc5341c13e00daa55b443cab..f03346c557bd8ee96fbadd354cec07cb9f014aa3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1255,
 /**/
     1254,
 /**/