[vlc-commits] contrib: gettext: fix osx patch

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat Jun 22 12:58:00 2013 +0200| [37ae9134495d3aa3e2665a4c3cf90a1443e331ae] | committer: Rafaël Carré

contrib: gettext: fix osx patch

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

 contrib/src/gettext/rules.mak |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/src/gettext/rules.mak b/contrib/src/gettext/rules.mak
index 04aedb4..ddac7e8 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)
@@ -32,9 +36,5 @@ 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 $@