[vlc-commits] Contribs: fix gettext compilation on some CrossCompile env

[Jean-Baptiste Kempf]

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Dec  8 23:55:57 2011 +0100| [da05ceb3d7d1c65d8e521879b47f9d2de83bee70] | committer: Jean-Baptiste Kempf

Contribs: fix gettext compilation on some CrossCompile env

And do the same compilation on all setups
(cherry picked from commit 9641b6cab87c203bf9c3c502b258be5fff35ff75)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/gettext/rules.mak |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/contrib/src/gettext/rules.mak b/contrib/src/gettext/rules.mak
index 7e1d820..015abe8 100644
--- a/contrib/src/gettext/rules.mak
+++ b/contrib/src/gettext/rules.mak
@@ -33,18 +33,7 @@ ifdef HAVE_WIN32
 else
 	(cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-java --disable-native-java --without-emacs)
 endif
-ifneq ($(HOST),$(BUILD))
-  ifndef HAVE_CYGWIN
-    # We'll use the installed gettext and only need to cross-compile libintl, also build autopoint and gettextsize tools need for VLC bootstrap
-	(cd $< && make -C gettext-runtime/intl && make -C gettext-runtime/intl install && make -C gettext-tools/misc install)
-  else
-    # We are compiling for MinGW on Cygwin -- build the full current gettext
-	(cd $< && make && make install)
-  endif
-else
-# Build and install the whole gettext
-	(cd $< && make && make install)
-endif
+	(cd $< && make -C gettext-runtime install && make -C gettext-tools/misc install && make -C gettext-tools/m4 install)
 # Work around another non-sense of autoconf.
 ifdef HAVE_WIN32
 	(cd $(PREFIX)/include; sed -i.orig '314 c #if 0' libintl.h)