summaryrefslogtreecommitdiff
path: root/utils/Makefile.in
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2018-03-05 20:29:56 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2018-03-05 20:29:56 +0100
commit01e9f2f202a0afc658bfd82c0ff1770de7900bb1 (patch)
tree32b51a4e799f01906dd97e6b77cc9e4ad2357796 /utils/Makefile.in
parentc03cce8f74e6bc58d195d416af96e0ff395a3125 (diff)
utils: fix compile of msgfmt/msgmerge
The host utils are missing the dependencies, the target utils need libiconv enabled.
Diffstat (limited to 'utils/Makefile.in')
-rw-r--r--utils/Makefile.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 99241845f..2f8d1c96a 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -83,7 +83,9 @@ utils_OUT := $(top_builddir)utils
DEPS-ldconfig := $(utils_DIR)/chroot_realpath.c
DEPS-ldconfig.host := $(DEPS-ldconfig)
DEPS-msgfmt := $(utils_DIR)/poparser.c $(utils_DIR)/StringEscape.c
+DEPS-msgfmt.host := $(DEPS-msgfmt)
DEPS-msgmerge := $(utils_DIR)/poparser.c $(utils_DIR)/StringEscape.c
+DEPS-msgmerge.host := $(DEPS-msgmerge)
utils_OBJ := getconf
ifeq ($(HAVE_SHARED),y)
@@ -96,7 +98,7 @@ utils_OBJ += iconv
utils_LOCALE_OBJ += $(utils_OUT)/locale
endif
-ifeq ($(UCLIBC_HAS_LIBINTL),y)
+ifeq ($(UCLIBC_HAS_LIBINTL)$(UCLIBC_HAS_LIBICONV),yy)
utils_OBJ += msgfmt msgmerge
endif
@@ -141,7 +143,7 @@ ifeq ($(UCLIBC_HAS_LOCALE),y)
$(Q)$(INSTALL) -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv
$(Q)$(INSTALL) -m 755 $(utils_OUT)/locale$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/locale
endif
-ifeq ($(UCLIBC_HAS_LIBINTL),y)
+ifeq ($(UCLIBC_HAS_LIBINTL)$(UCLIBC_HAS_LIBICONV),yy)
$(Q)$(INSTALL) -m 755 $(utils_OUT)/msgmerge$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/msgmerge
$(Q)$(INSTALL) -m 755 $(utils_OUT)/msgfmt$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/msgfmt
$(Q)$(INSTALL) -m 755 $(utils_OUT)/xgettext $(PREFIX)$(DEVEL_PREFIX)bin