summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-08-13 20:00:34 +0000
committerEric Andersen <andersen@codepoet.org>2001-08-13 20:00:34 +0000
commit24700c28ae7d0ac28c1109da2d15ac7d5b95858c (patch)
tree082f77090389cfc46ac6718efc9aeff3a1a59b4f
parentae8937b0de74e5c2914147dbb37ef42898f0e263 (diff)
Fix SYSTEM_DEVEL_PREFIX to allow install of the <arch>-uclibc- spoofer
toolchain to any arbitrary directory...
-rw-r--r--Makefile8
-rwxr-xr-xdebian/rules2
-rw-r--r--extra/Configs/Config.i38610
-rw-r--r--extra/gcc-uClibc/Makefile16
4 files changed, 18 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index 3d33f4130..1064fcf28 100644
--- a/Makefile
+++ b/Makefile
@@ -199,9 +199,9 @@ ifeq ($(strip $(HAVE_SHARED)),true)
cp -a lib/*.so.* $(PREFIX)$(DEVEL_PREFIX)/lib
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)/usr/bin
- ln -fs $(DEVEL_PREFIX)/bin/ldd $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/usr/bin/$(TARGET_ARCH)-uclibc-ldd
- ln -fs $(DEVEL_PREFIX)/bin/readelf $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/usr/bin/$(TARGET_ARCH)-uclibc-readelf
+ 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 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so ] ; then \
install -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so $(PREFIX)$(DEVEL_PREFIX)/lib; \
ln -s $(PREFIX)$(DEVEL_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so \
@@ -210,7 +210,7 @@ ifeq ($(strip $(HAVE_SHARED)),true)
if [ -x ldso/util/ldconfig ] ; then \
install -d $(PREFIX)$(DEVEL_PREFIX)/etc; \
install -m 755 ldso/util/ldconfig $(PREFIX)$(DEVEL_PREFIX)/bin; \
- ln -fs $(DEVEL_PREFIX)/sbin/ldconfig $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/usr/bin/$(TARGET_ARCH)-uclibc-ldconfig; \
+ ln -fs $(DEVEL_PREFIX)/sbin/ldconfig $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig; \
fi;
endif
diff --git a/debian/rules b/debian/rules
index 1922cfab0..0c905b688 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,7 @@ ifneq ($(target),$(DEB_HOST_GNU_CPU))
echo 'CROSS = $(target)-linux-' >>Config
endif
echo 'DOPIC = true' >>Config
- echo 'SYSTEM_DEVEL_PREFIX = /' >>Config
+ echo 'SYSTEM_DEVEL_PREFIX = /usr' >>Config
echo 'DEVEL_PREFIX = /usr/$$(TARGET_ARCH)-linux-uclibc' >>Config
echo 'SHARED_LIB_LOADER_PATH = /lib' >>Config
#echo 'TARGET_PREFIX = /' >>Config
diff --git a/extra/Configs/Config.i386 b/extra/Configs/Config.i386
index 33ce45a4e..44ee3d06b 100644
--- a/extra/Configs/Config.i386
+++ b/extra/Configs/Config.i386
@@ -172,11 +172,11 @@ SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
DEVEL_PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
# SYSTEM_DEVEL_PREFIX is the directory prefix used when installing
-# usr/bin/arch-uclibc-gcc, usr/bin/arch-uclibc-ld, etc. This is only
-# used by the 'make install' target, and is not compiled into anything.
-# This defaults to $DEVEL_PREFIX, but makers of .rpms and .debs will
-# want to set this to "/" instead.
-SYSTEM_DEVEL_PREFIX = $(DEVEL_PREFIX)
+# bin/arch-uclibc-gcc, bin/arch-uclibc-ld, etc. This is only used by
+# the 'make install' target, and is not compiled into anything. This
+# defaults to $DEVEL_PREFIX/usr, but makers of .rpms and .debs will
+# want to set this to "/usr" instead.
+SYSTEM_DEVEL_PREFIX = $(DEVEL_PREFIX)/usr
# If you want 'make install' to install everything under a temporary
# directory, the define PREFIX during the install step,
diff --git a/extra/gcc-uClibc/Makefile b/extra/gcc-uClibc/Makefile
index 3b51c104c..8fe33fe9e 100644
--- a/extra/gcc-uClibc/Makefile
+++ b/extra/gcc-uClibc/Makefile
@@ -33,17 +33,17 @@ ld-uClibc:
install: all
install -d $(PREFIX)$(DEVEL_PREFIX)/bin;
- install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/usr/bin;
- install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/usr/bin/
- install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/usr/bin/
- ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/usr/bin/$(TARGET_ARCH)-uclibc-cc
- ln -fs $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/usr/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/gcc
- ln -fs $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/usr/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/cc
- ln -fs $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/usr/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_PREFIX)/bin/ld
+ install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin;
+ install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/
+ install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/
+ ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc
+ ln -fs $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/gcc
+ ln -fs $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/cc
+ ln -fs $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_PREFIX)/bin/ld
for app in addr2line ar as cpp gasp nm objcopy \
objdump ranlib size strings strip; do \
ln -fs `which $(CROSS)$${app}` $(PREFIX)$(DEVEL_PREFIX)/bin/$${app}; \
- ln -fs `which $(CROSS)$${app}` $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/usr/bin/$(TARGET_ARCH)-uclibc-$${app}; \
+ ln -fs `which $(CROSS)$${app}` $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \
done
clean: