Commit 50e47a05 authored by Rafaël Carré's avatar Rafaël Carré

contrib: gettext: patch gettext.m4 post install to not re-run autotools

parent cd7b29a5
...@@ -15,10 +15,6 @@ $(TARBALLS)/gettext-$(GETTEXT_VERSION).tar.gz: ...@@ -15,10 +15,6 @@ $(TARBALLS)/gettext-$(GETTEXT_VERSION).tar.gz:
gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
$(UNPACK) $(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) $(MOVE)
DEPS_gettext = iconv $(DEPS_iconv) DEPS_gettext = iconv $(DEPS_iconv)
...@@ -35,6 +31,10 @@ ifdef HAVE_WIN32 ...@@ -35,6 +31,10 @@ 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)
(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) (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 endif
touch $@ touch $@
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