Browse Source

Same for utils, renamed install_utils to utils_install to avoid conflict when added to top Makefile.in

Peter S. Mazinger 18 years ago
parent
commit
eddd4169f1
2 changed files with 4 additions and 8 deletions
  1. 2 2
      Makefile.in
  2. 2 6
      utils/Makefile.in

+ 2 - 2
Makefile.in

@@ -237,7 +237,7 @@ utils:
 
 # Installs helper applications, such as 'ldd' and 'ldconfig'
 install_utils: utils
-	$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils install
+	$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install
 
 else # ifeq ($(HAVE_DOT_CONFIG),y)
 
@@ -306,7 +306,7 @@ clean:
 	$(MAKE) -C extra/locale locale_clean
 	$(MAKE) headers_clean-y
 	$(MAKE) -C test clean
-	$(MAKE) -C utils clean
+	$(MAKE) -C utils utils_clean
 	@set -e; \
 	for i in `(cd libc/sysdeps/linux/common/sys; ls *.h)` ; do \
 		$(RM) include/sys/$$i; \

+ 2 - 6
utils/Makefile.in

@@ -73,13 +73,9 @@ hostutils: $(hostutils_OBJ)
 $(hostutils_OBJ): $(utils_OUT)/%.host : $(utils_DIR)/%.c
 	$(hcompile.u)
 
-# to be removed after included by main Makefile.in
-install: install_utils
-clean: utils_clean
+install-y += utils_install
 
-install-y += install_utils
-
-install_utils: utils
+utils_install: utils
 	$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)usr/bin
 	#$(INSTALL) -m 755 $(utils_OUT)/readelf $(PREFIX)$(RUNTIME_PREFIX)usr/bin/readelf
 ifeq ($(HAVE_SHARED),y)