diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2005-11-25 16:32:43 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2005-11-25 16:32:43 +0000 |
| commit | eddd4169f141fe0919cb872fa38fa95f022e67df (patch) | |
| tree | 77fb202c2eb8fc6064aa8c5d1a246302a1fcee1c | |
| parent | 7eb0eeee374010bc7c0cd300322076fcfe17380b (diff) | |
Same for utils, renamed install_utils to utils_install to avoid conflict when added to top Makefile.in
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | utils/Makefile.in | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 2c9dbe780..c1bdeed22 100644 --- a/Makefile.in +++ b/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; \ diff --git a/utils/Makefile.in b/utils/Makefile.in index 97ad20a23..be5255a4e 100644 --- a/utils/Makefile.in +++ b/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) |