Mercurial > vim
changeset 16289:b4c7e026685c v8.1.1149
patch 8.1.1149: building desktop files fails with older msgfmt
commit https://github.com/vim/vim/commit/26096cc96fc402db45948b3b662a380281585649
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Apr 11 15:25:40 2019 +0200
patch 8.1.1149: building desktop files fails with older msgfmt
Problem: Building desktop files fails with older msgfmt.
Solution: Add autoconf check. Avoid always building the desktop files.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 11 Apr 2019 15:30:03 +0200 |
parents | 199cef46e9f9 |
children | af4656bdc3b5 |
files | src/auto/configure src/config.mk.in src/configure.ac src/po/Make_all.mak src/po/Makefile src/version.c |
diffstat | 6 files changed, 70 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -623,6 +623,7 @@ ac_subst_vars='LTLIBOBJS LIBOBJS LINK_AS_NEEDED DEPEND_CFLAGS_FILTER +MSGFMT_DESKTOP MAKEMO MSGFMT INSTALL_TOOL_LANGS @@ -14533,6 +14534,18 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt supports --desktop" >&5 +$as_echo_n "checking if msgfmt supports --desktop... " >&6; } + MSGFMT_DESKTOP= + if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + MSGFMT_DESKTOP="gvim.desktop vim.desktop" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no \"po/Makefile\" - disabled" >&5
--- a/src/config.mk.in +++ b/src/config.mk.in @@ -169,6 +169,7 @@ OS_EXTRA_OBJ = @OS_EXTRA_OBJ@ MAKEMO = @MAKEMO@ MSGFMT = @MSGFMT@ +MSGFMT_DESKTOP = @MSGFMT_DESKTOP@ # Make sure that "make first" will run "make all" once configure has done its # work. This is needed when using the Makefile in the top directory.
--- a/src/configure.ac +++ b/src/configure.ac @@ -4298,6 +4298,15 @@ if test "$enable_nls" = "yes"; then [++_nl_msg_cat_cntr;], AC_MSG_RESULT([yes]); AC_DEFINE(HAVE_NL_MSG_CAT_CNTR), AC_MSG_RESULT([no])) + AC_MSG_CHECKING([if msgfmt supports --desktop]) + MSGFMT_DESKTOP= + if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then + AC_MSG_RESULT([yes]) + MSGFMT_DESKTOP="gvim.desktop vim.desktop" + else + AC_MSG_RESULT([no]) + fi + AC_SUBST(MSGFMT_DESKTOP) fi else AC_MSG_RESULT([no "po/Makefile" - disabled]);
--- a/src/po/Make_all.mak +++ b/src/po/Make_all.mak @@ -45,6 +45,49 @@ LANGUAGES = \ zh_TW.UTF-8 \ +POFILES = \ + af.po \ + ca.po \ + cs.po \ + cs.cp1250.po \ + da.po \ + de.po \ + en_GB.po \ + eo.po \ + es.po \ + fi.po \ + fr.po \ + ga.po \ + it.po \ + ja.po \ + ja.euc-jp.po \ + ja.sjis.po \ + ko.po \ + ko.UTF-8.po \ + lv.po \ + nb.po \ + nl.po \ + no.po \ + pl.po \ + pl.UTF-8.po \ + pl.cp1250.po \ + pt_BR.po \ + ru.po \ + ru.cp1251.po \ + sk.po \ + sk.cp1250.po \ + sr.po \ + sv.po \ + uk.po \ + uk.cp1251.po \ + vi.po \ + zh_CN.po \ + zh_CN.UTF-8.po \ + zh_CN.cp936.po \ + zh_TW.po \ + zh_TW.UTF-8.po \ + + MOFILES = \ af.mo \ ca.mo \
--- a/src/po/Makefile +++ b/src/po/Makefile @@ -25,9 +25,6 @@ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_ .SUFFIXES: .po .mo .pot .ck .PHONY: all install uninstall prefixcheck converted check clean checkclean distclean update-po $(LANGUAGES) -LINGUAS: - @echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS - .po.mo: $(MSGFMTCMD) -o $@ $< @@ -35,7 +32,7 @@ LINGUAS: $(VIM) -u NONE -e -X -S check.vim -c "if error == 0 | q | endif" -c cq $< touch $@ -all: $(MOFILES) $(MOCONVERTED) gvim.desktop vim.desktop +all: $(MOFILES) $(MOCONVERTED) $(MSGFMT_DESKTOP) check: $(CHECKFILES) @@ -167,7 +164,7 @@ checkclean: po/gvim.desktop.in po/vim.desktop.in mv -f ../$(PACKAGE).po $(PACKAGE).pot -%.desktop: %.desktop.in $(PACKAGE).pot LINGUAS +%.desktop: %.desktop.in $(POFILES) $(MSGFMT) --desktop -d . --template $< -o $@ cp -f $@ ../../runtime/$@