summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-11-07 04:13:30 +0000
committerEric Andersen <andersen@codepoet.org>2003-11-07 04:13:30 +0000
commitf0de7b236e4aefa00bce0e20b2216dc282ede09c (patch)
tree2264a1035790f85af6f505ffb064e1b6b44df3ad /Makefile
parente556691e4f2411bddc228266e9fcb8dbbf122ac6 (diff)
It is remotely possible the utils might even compile this time
around...
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 4 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 636bd6c89..47503c27f 100644
--- a/Makefile
+++ b/Makefile
@@ -179,7 +179,7 @@ $(patsubst %, _dir_%, $(DIRS)) : dummy
tags:
ctags -R
-install: install_dev install_runtime install_utils finished2
+install: install_runtime install_dev finished2
# Installs header files and development library links.
@@ -270,26 +270,16 @@ ifeq ($(strip $(HAVE_SHARED)),y)
fi;
endif
+.PHONY: utils
ifeq ($(strip $(HAVE_SHARED)),y)
-utils: $(TOPDIR)utils/ldd
+utils:
$(MAKE) -C utils
else
utils: dummy
endif
install_utils: utils
-ifeq ($(strip $(HAVE_SHARED)),y)
- $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)sbin
- $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)usr/bin
- $(INSTALL) -m 755 ldso/util/ldd \
- $(PREFIX)$(RUNTIME_PREFIX)usr/bin/ldd
- $(INSTALL) -m 755 ldso/util/ldconfig \
- $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig;
- # For now, don't bother with readelf since surely the host
- # system has binutils, or we couldn't have gotten this far...
- #$(INSTALL) -m 755 ldso/util/readelf \
- # $(PREFIX)$(RUNTIME_PREFIX)usr/bin/readelf
-endif
+ $(MAKE) CFLAGS= LDFLAGS= -C utils install
ifeq ($(strip $(UCLIBC_HAS_LOCALE)),y)
@$(MAKE) -C libc/misc/wchar iconv.target
$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)/usr/bin;