diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-03 21:20:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-03 21:20:03 +0200 |
| commit | 12e91862c14a1af44b537d478e8a5021893044fe (patch) | |
| tree | 87dcf5d003bfc43f8b357b64874f1b6912ccdb0d | |
| parent | 61df0c7996d9acc94267735abc214cb176e63ede (diff) | |
| download | vim-git-12e91862c14a1af44b537d478e8a5021893044fe.tar.gz | |
patch 8.1.1255: building desktop files fails on FreeBSDv8.1.1255
Problem: Building desktop files fails on FreeBSD. (Adam Weinberger)
Solution: Avoid using non-portable construct in Makefile. (closes #4332)
| -rw-r--r-- | src/po/Makefile | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/po/Makefile b/src/po/Makefile index 7c03fe4a7..cc56b83d2 100644 --- 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 0882fa267..f03346c55 100644 --- 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, |