From 03f7612acc323011a680c64d613badc62017d3fa Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 25 Jan 2002 02:56:12 +0000 Subject: Miles Bader noticed that `make install' tries to build ldso stuff on non-shared-library systems. And Matthew Bloch noticed that we need to create some dirs before installing some stuff, so fix that as well. -Erik --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1490f0cc8..7e88c8850 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000,2001 Erik Andersen +# Copyright (C) 2000,2001,2002 Erik Andersen # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU Library General Public License as published by the Free @@ -186,9 +186,9 @@ install: install_dev install_runtime install_toolchain # Installs header files and development library links. install_dev: install -d $(PREFIX)$(DEVEL_PREFIX)/lib - install -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)/lib/ install -d $(PREFIX)$(DEVEL_PREFIX)/usr/lib install -d $(PREFIX)$(DEVEL_PREFIX)/include + install -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)/lib/ tar -chO include | tar -xC $(PREFIX)$(DEVEL_PREFIX); -@for i in `find $(PREFIX)$(DEVEL_PREFIX) -type d` ; do \ chmod -f 755 $$i; chmod -f 644 $$i/*.h; \ @@ -218,10 +218,14 @@ ifeq ($(strip $(HAVE_SHARED)),true) endif install_toolchain: + install -d $(PREFIX)$(DEVEL_PREFIX)/lib + install -d $(PREFIX)$(DEVEL_PREFIX)/bin + install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin + $(MAKE) -C extra/gcc-uClibc install +ifeq ($(strip $(HAVE_SHARED)),true) @$(MAKE) -C ldso utils install -m 755 ldso/util/ldd $(PREFIX)$(DEVEL_PREFIX)/bin install -m 755 ldso/util/readelf $(PREFIX)$(DEVEL_PREFIX)/bin - install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin ln -fs $(DEVEL_PREFIX)/bin/ldd $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd ln -fs $(DEVEL_PREFIX)/bin/readelf $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf @if [ -x ldso/util/ldconfig ] ; then \ @@ -230,7 +234,7 @@ install_toolchain: install -m 755 ldso/util/ldconfig $(PREFIX)$(DEVEL_PREFIX)/bin; \ ln -fs $(DEVEL_PREFIX)/sbin/ldconfig $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig; \ fi; - $(MAKE) -C extra/gcc-uClibc install +endif # Installs run-time libraries and helper apps in preparation for -- cgit v1.2.3