[vlc-commits] contrib: gettext: patch gettext.m4 post install to not re-run autotools

[Rafaël Carré]

vlc/vlc-2.1 | branch: master | Rafaël Carré <funman at videolan.org> | Wed Jun 26 21:27:13 2013 +0200| [17ebafc8383b852d5ca12cd741a765a4f0316f8d] | committer: David Fuhrmann

contrib: gettext: patch gettext.m4 post install to not re-run autotools
(cherry picked from commit 50e47a0571bd33416796e694f68107bb5ec581f1)

Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=17ebafc8383b852d5ca12cd741a765a4f0316f8d
---

 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 ddac7e8..59fc40b 100644
--- a/contrib/src/gettext/rules.mak
+++ b/contrib/src/gettext/rules.mak
@@ -15,10 +15,6 @@ $(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)
@@ -36,5 +32,9 @@ 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
+	sed -i.orig  's/$$LIBS $$LIBINTL/$$LIBS $$LIBINTL $$INTL_MACOSX_LIBS/' "$(PREFIX)"/share/aclocal/gettext.m4
+endif
 	touch $@