summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2008-12-10 00:29:29 +0000
committerRob Landley <rob@landley.net>2008-12-10 00:29:29 +0000
commit34cbfc9bf8588b39723be1bda37775bd1a976ccd (patch)
treea2c1360542abc7d63538e04165aa82c079596d5e /utils
parente34f25503ad8f9d5b7e8d1801cbe345ce3daa949 (diff)
Remove hardwired usr/ from install_utils (that's what $RUNTIME_PREFIX is for)
and add install_hostutils. Now install_utils should use $PREFIX more like other packages do.
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile.in14
1 files changed, 8 insertions, 6 deletions
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