summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.help1
-rw-r--r--Makefile.in3
-rw-r--r--utils/Makefile.in14
3 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.help b/Makefile.help
index 656ed90fd..deae677b5 100644
--- a/Makefile.help
+++ b/Makefile.help
@@ -34,6 +34,7 @@ help:
@echo ' install_dev - install all headers and static libs'
@echo ' install_headers - install headers excluding generated ones'
@echo ' install_utils - install target utilities'
+ @echo ' install_hostutils - install host utilities'
@echo
@echo 'Development:'
@echo ' check - run testsuite'
diff --git a/Makefile.in b/Makefile.in
index 5f460a613..d2b3b2bf0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -447,6 +447,9 @@ utils:
install_utils: utils
$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install
+install_hostutils: hostutils
+ $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install DOTHOST=.host
+
endif # ifeq ($(HAVE_DOT_CONFIG),y)
include/bits include/config:
diff --git a/utils/Makefile.in b/utils/Makefile.in
index ebaa3e4fd..e3bf4115a 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -83,15 +83,17 @@ $(hostutils_OBJ): $(utils_OUT)/%.host : $(utils_DIR)/%.c
install-y += utils_install
-utils_install: utils
- #$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/readelf $(PREFIX)$(RUNTIME_PREFIX)usr/bin/readelf
+# This installs both utils and hostutils, so doesn't depend on either.
+
+utils_install:
+ $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/readelf$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)bin/readelf
ifeq ($(HAVE_SHARED),y)
- $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldd $(PREFIX)$(RUNTIME_PREFIX)usr/bin/ldd
- $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldconfig $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
+ $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldd$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)bin/ldd
+ $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldconfig$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
endif
ifeq ($(UCLIBC_HAS_LOCALE),y)
- $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/iconv $(PREFIX)$(RUNTIME_PREFIX)usr/bin/iconv
- $(Q)$(INSTALL) -m 755 $(utils_OUT)/locale $(PREFIX)$(RUNTIME_PREFIX)usr/bin/locale
+ $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)bin/iconv
+ $(Q)$(INSTALL) -m 755 $(utils_OUT)/locale$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)bin/locale
endif
objclean-y += utils_clean