contribs: update gettext to 0.18

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6c5bfcb6b0bf2b529d62dfeaf947b78d72fc695c..73533feebf5f34028a7db9a3b184e2a5930c7fd2 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -376,9 +376,6 @@ gettext-$(GETTEXT_VERSION).tar.gz:
 
 gettext: gettext-$(GETTEXT_VERSION).tar.gz
        $(EXTRACT_GZ)
-ifdef HAVE_WIN32
-       patch -p0 < Patches/gettext-win32.patch
-endif
 ifdef HAVE_DARWIN_OS
        patch -p0 < Patches/gettext-macosx.patch
 endif
@@ -392,18 +389,18 @@ 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 && patch -p1 < ../Patches/libintl.patch && make -C gettext-runtime/intl install && make -C gettext-tools/misc install )
+       ( 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 && patch -p1 < ../Patches/libintl.patch && make install )
+       ( cd $< && make && make install )
   endif
 else
 # Build and install the whole gettext
-       ( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install )
+       ( cd $< && make && make install )
 endif
 # Work around another non-sense of autoconf.
 ifdef HAVE_WIN32
-       (cd $(PREFIX)/include; sed -i.orig '311 c #if 0' libintl.h)
+       (cd $(PREFIX)/include; sed -i.orig '314 c #if 0' libintl.h)
 endif
        $(INSTALL_NAME)
        touch $@