diff options
| author | Karl Berry <karl@freefriends.org> | 2015-12-31 08:04:07 -0800 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2015-12-31 08:04:07 -0800 |
| commit | c86965970adb66e17d5d9a39574b75fc25c56784 (patch) | |
| tree | 096be982bfc9f8ef0ce261f71caa27c3b2eb0006 /build-aux/po | |
| parent | 8cc2bb4823a7566c567e270b711af6a3f07e6082 (diff) | |
| download | gnulib-c86965970adb66e17d5d9a39574b75fc25c56784.tar.gz | |
autoupdate
Diffstat (limited to 'build-aux/po')
| -rw-r--r-- | build-aux/po/Makefile.in.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/build-aux/po/Makefile.in.in b/build-aux/po/Makefile.in.in index fa59cf1ed9..8f34f00754 100644 --- a/build-aux/po/Makefile.in.in +++ b/build-aux/po/Makefile.in.in @@ -6,7 +6,7 @@ # notice and this notice are preserved. This file is offered as-is, # without any warranty. # -# Origin: gettext-0.19.6 +# Origin: gettext-0.19.7 GETTEXT_MACRO_VERSION = 0.19 PACKAGE = @PACKAGE@ @@ -43,6 +43,11 @@ install_sh = $(SHELL) @install_sh@ MKDIR_P = @MKDIR_P@ mkdir_p = @mkdir_p@ +# When building gettext-tools, we prefer to use the built programs +# rather than installed programs. However, we can't do that when we +# are cross compiling. +CROSS_COMPILING = @CROSS_COMPILING@ + GMSGFMT_ = @GMSGFMT@ GMSGFMT_no = @GMSGFMT@ GMSGFMT_yes = @GMSGFMT_015@ @@ -430,7 +435,7 @@ update-po: Makefile .nop.po-update: @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ - if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ + if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ |