From: Rafaël Carré <funman@videolan.org>
Date: Sat, 22 Jun 2013 10:58:00 +0000 (+0200)
Subject: contrib: gettext: fix osx patch
X-Git-Tag: 2.1.0-git~50
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=37ae9134495d3aa3e2665a4c3cf90a1443e331ae;p=vlc

contrib: gettext: fix osx patch
---

diff --git a/contrib/src/gettext/rules.mak b/contrib/src/gettext/rules.mak
index 04aedb4621..ddac7e8e7d 100644
--- a/contrib/src/gettext/rules.mak
+++ b/contrib/src/gettext/rules.mak
@@ -15,6 +15,10 @@ $(TARBALLS)/gettext-$(GETTEXT_VERSION).tar.gz:
 
 gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
 	$(UNPACK)
+ifdef HAVE_MACOSX
+	# detect libintl correctly in configure for static library
+	sed -i.orig  's/$$LIBS $$LIBINTL/$$LIBS $$LIBINTL $$INTL_MACOSX_LIBS/' gettext-$(GETTEXT_VERSION)/gettext-runtime/m4/gettext.m4
+endif
 	$(MOVE)
 
 DEPS_gettext = iconv $(DEPS_iconv)
@@ -31,10 +35,6 @@ ifdef HAVE_WIN32
 else
 	(cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-java --disable-native-java --without-emacs)
 	(cd $< && $(MAKE) -C gettext-runtime install && $(MAKE) -C gettext-tools/intl && $(MAKE) -C gettext-tools/libgrep && $(MAKE) -C gettext-tools/gnulib-lib && $(MAKE) -C gettext-tools/src install && $(MAKE) -C gettext-tools/misc install && $(MAKE) -C gettext-tools/m4 install)
-endif
-ifdef HAVE_MACOSX
-	# detect libintl correctly in configure for static library
-	(cd $(PREFIX)/share/aclocal; sed -i.orig  '184s/$$LIBINTL/$$LIBINTL $$INTL_MACOSX_LIBS/' gettext.m4)
 endif
 	touch $@