Commit da05ceb3 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: fix gettext compilation on some CrossCompile env

And do the same compilation on all setups
(cherry picked from commit 9641b6ca)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent a4ba0b02
...@@ -33,18 +33,7 @@ ifdef HAVE_WIN32 ...@@ -33,18 +33,7 @@ ifdef HAVE_WIN32
else else
(cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-java --disable-native-java --without-emacs) (cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-java --disable-native-java --without-emacs)
endif endif
ifneq ($(HOST),$(BUILD)) (cd $< && make -C gettext-runtime install && make -C gettext-tools/misc install && make -C gettext-tools/m4 install)
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
# Work around another non-sense of autoconf. # Work around another non-sense of autoconf.
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $(PREFIX)/include; sed -i.orig '314 c #if 0' libintl.h) (cd $(PREFIX)/include; sed -i.orig '314 c #if 0' libintl.h)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment