svn commit: trunk/uClibc: utils

[landley at uclibc.org]

Author: landley
Date: 2008-12-09 16:29:29 -0800 (Tue, 09 Dec 2008)
New Revision: 24350

Log:
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.


Modified:
   trunk/uClibc/Makefile.help
   trunk/uClibc/Makefile.in
   trunk/uClibc/utils/Makefile.in


Changeset:
Modified: trunk/uClibc/Makefile.help
===================================================================
--- trunk/uClibc/Makefile.help	2008-12-09 22:53:31 UTC (rev 24349)
+++ trunk/uClibc/Makefile.help	2008-12-10 00:29:29 UTC (rev 24350)
@@ -34,6 +34,7 @@
 	@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'

Modified: trunk/uClibc/Makefile.in
===================================================================
--- trunk/uClibc/Makefile.in	2008-12-09 22:53:31 UTC (rev 24349)
+++ trunk/uClibc/Makefile.in	2008-12-10 00:29:29 UTC (rev 24350)
@@ -447,6 +447,9 @@
 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:

Modified: trunk/uClibc/utils/Makefile.in
===================================================================
--- trunk/uClibc/utils/Makefile.in	2008-12-09 22:53:31 UTC (rev 24349)
+++ trunk/uClibc/utils/Makefile.in	2008-12-10 00:29:29 UTC (rev 24350)
@@ -83,15 +83,17 @@
 
 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