[vlc-commits] Fix bootstrap altering git-tracked files

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Sep 20 11:38:29 2016 +0300| [841ff1fde0cb7de6006f88a4017f6fd15c3f4699] | committer: Rémi Denis-Courmont

Fix bootstrap altering git-tracked files

Regression from 5a739e49d6e20a4ccfcf92721c9bb381a14f471e.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=841ff1fde0cb7de6006f88a4017f6fd15c3f4699
---

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

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index fa59cf1..8f34f00 100644
--- a/po/Makefile.in.in
+++ b/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) && "; \