From 24700c28ae7d0ac28c1109da2d15ac7d5b95858c Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 13 Aug 2001 20:00:34 +0000
Subject: Fix SYSTEM_DEVEL_PREFIX to allow install of the <arch>-uclibc-
 spoofer toolchain to any arbitrary directory...

---
 extra/Configs/Config.i386 | 10 +++++-----
 extra/gcc-uClibc/Makefile | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'extra')

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:
-- 
cgit v1.2.3