From c86965970adb66e17d5d9a39574b75fc25c56784 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 31 Dec 2015 08:04:07 -0800
Subject: autoupdate

---
 build-aux/po/Makefile.in.in | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'build-aux')

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) && "; \
-- 
cgit v1.2.1