diff options
| -rw-r--r-- | package/gettext/gettext.mk | 8 | ||||
| -rw-r--r-- | package/pkg-autotools.mk | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index c8ef765870..121d25dcc4 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -57,6 +57,12 @@ endef GETTEXT_POST_INSTALL_TARGET_HOOKS += GETTEXT_REMOVE_UNNEEDED +define GETTEXT_GETTEXTIZE_EYE_CANDY + $(SED) '/Press Return\|read dummy/d' $(HOST_DIR)/usr/bin/gettextize +endef + +HOST_GETTEXT_POST_INSTALL_HOOKS += GETTEXT_GETTEXTIZE_EYE_CANDY + # Force build with NLS support, otherwise libintl is not built # This is needed because some packages (eg. libglib2) requires # locales, but do not properly depend on BR2_ENABLE_LOCALE, and @@ -72,5 +78,7 @@ define HOST_GETTEXT_GETTEXTIZE_CONFIRMATION endef HOST_GETTEXT_POST_INSTALL_HOOKS += HOST_GETTEXT_GETTEXTIZE_CONFIRMATION +GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/usr/bin/autom4te $(HOST_DIR)/usr/bin/gettextize -f + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 557413dba2..53bca30645 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -95,12 +95,8 @@ ifndef $(2)_GETTEXTIZE endif endif -ifndef $(2)_GETTEXTIZE_OPT - ifdef $(3)_GETTEXTIZE_OPT - $(2)_GETTEXTIZE_OPT = $$($(3)_GETTEXTIZE_OPT) - else - $(2)_GETTEXTIZE_OPT ?= -f - endif +ifeq ($(4),host) + $(2)_GETTEXTIZE_OPT ?= $$($(3)_GETTEXTIZE_OPT) endif ifeq ($(4),host) @@ -220,7 +216,7 @@ endif # define GETTEXTIZE_HOOK @$$(call MESSAGE,"Gettextizing") - $(Q)cd $$($$(PKG)_SRCDIR) && $(HOST_DIR)/usr/bin/gettextize $$($$(PKG)_GETTEXTIZE_OPT) + $(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPT) endef # |
