Resync the install defines

 -Erik

diff --git a/extra/Configs/Config.alpha b/extra/Configs/Config.alpha
index 8fbfbf3..614384d 100644 (file)
--- a/extra/Configs/Config.alpha
+++ b/extra/Configs/Config.alpha
@@ -176,7 +176,6 @@ SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
@@ -185,13 +184,21 @@ 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.
+# 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)
 
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
+
 # If you want 'make install' to install everything under a temporary
 # directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
 #PREFIX = $(TOPDIR)/_install
+

diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
index 3e4ded2..528d9c8 100644 (file)
--- a/extra/Configs/Config.arm
+++ b/extra/Configs/Config.arm
@@ -177,7 +177,6 @@ SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
@@ -190,9 +189,17 @@ DEVEL_PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
 # 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
+SYSTEM_DEVEL_PREFIX = $(DEVEL_PREFIX)
+
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
 
 # If you want 'make install' to install everything under a temporary
 # directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
 #PREFIX = $(TOPDIR)/_install
+

diff --git a/extra/Configs/Config.cross.arm.uclinux b/extra/Configs/Config.cross.arm.uclinux
index 2a2abae..9c474dc 100644 (file)
--- a/extra/Configs/Config.cross.arm.uclinux
+++ b/extra/Configs/Config.cross.arm.uclinux
@@ -174,22 +174,30 @@ BUILD_UCLIBC_LDSO=false
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
 # directory is compiled into the uclibc cross compiler spoofer, you
 # have to recompile if you change this value...
+#DEVEL_PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
 DEVEL_PREFIX = /opt/uClinux/$(TARGET_ARCH)-elf
 
 # 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 = /
+# 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)
+
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
 
 # If you want 'make install' to install everything under a temporary
 # directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
 #PREFIX = $(TOPDIR)/_install
+

diff --git a/extra/Configs/Config.h8300 b/extra/Configs/Config.h8300
index fab1390..9d27b7e 100644 (file)
--- a/extra/Configs/Config.h8300
+++ b/extra/Configs/Config.h8300
@@ -168,30 +168,37 @@ BUILD_UCLIBC_LDSO=false
 # sitting in the directory this points to, your binaries will not run.
 #SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 
+# C defiend symbols prefix charactor
+C_SYMBOL_PREFIX = _
+
 # DEVEL_PREFIX is the directory into which the uClibc development
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
 # directory is compiled into the uclibc cross compiler spoofer, you
 # have to recompile if you change this value...
+#DEVEL_PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
 DEVEL_PREFIX = /opt/uClinux/$(TARGET_ARCH)-coff
 
 # 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 = /
+# 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)
+
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
 
 # If you want 'make install' to install everything under a temporary
 # directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
 #PREFIX = $(TOPDIR)/_install
-PREFIX =
 
-# C defiend symbols prefix charactor
-C_SYMBOL_PREFIX = _

diff --git a/extra/Configs/Config.i386 b/extra/Configs/Config.i386
index f107f6c..c2e3d36 100644 (file)
--- a/extra/Configs/Config.i386
+++ b/extra/Configs/Config.i386
@@ -173,7 +173,6 @@ SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
@@ -186,9 +185,17 @@ DEVEL_PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
 # 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
+SYSTEM_DEVEL_PREFIX = $(DEVEL_PREFIX)
+
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
 
 # If you want 'make install' to install everything under a temporary
 # directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
 #PREFIX = $(TOPDIR)/_install
+

diff --git a/extra/Configs/Config.i960 b/extra/Configs/Config.i960
index 6ee2352..2004bfe 100644 (file)
--- a/extra/Configs/Config.i960
+++ b/extra/Configs/Config.i960
@@ -189,31 +189,36 @@ BUILD_UCLIBC_LDSO=false
 # sitting in the directory this points to, your binaries will not run.
 #SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 
+# C defiend symbols prefix charactor
+C_SYMBOL_PREFIX = _
+
 # DEVEL_PREFIX is the directory into which the uClibc development
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
 # directory is compiled into the uclibc cross compiler spoofer, you
 # have to recompile if you change this value...
-DEVEL_PREFIX = /usr/local/cross-compilers/i960-intel-coff
+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)
-SYSTEM_DEVEL_PREFIX = /tmp/uclibc-trashed
+# 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)
+
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
 
 # If you want 'make install' to install everything under a temporary
 # directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
 #PREFIX = $(TOPDIR)/_install
 
-# C defiend symbols prefix charactor
-C_SYMBOL_PREFIX = _
-

diff --git a/extra/Configs/Config.m68k b/extra/Configs/Config.m68k
index 4686d86..ea85f38 100644 (file)
--- a/extra/Configs/Config.m68k
+++ b/extra/Configs/Config.m68k
@@ -186,7 +186,6 @@ SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
@@ -199,9 +198,17 @@ DEVEL_PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
 # 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
+SYSTEM_DEVEL_PREFIX = $(DEVEL_PREFIX)
+
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
 
 # If you want 'make install' to install everything under a temporary
 # directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
 #PREFIX = $(TOPDIR)/_install
+

diff --git a/extra/Configs/Config.m68k.coff b/extra/Configs/Config.m68k.coff
index e35dc02..4a34094 100644 (file)
--- a/extra/Configs/Config.m68k.coff
+++ b/extra/Configs/Config.m68k.coff
@@ -189,22 +189,30 @@ BUILD_UCLIBC_LDSO=false
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
 # directory is compiled into the uclibc cross compiler spoofer, you
 # have to recompile if you change this value...
+#DEVEL_PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
 DEVEL_PREFIX = /opt/uClinux/$(TARGET_ARCH)-coff
 
 # 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 = /
+# 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)
+
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
 
 # If you want 'make install' to install everything under a temporary
 # directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
 #PREFIX = $(TOPDIR)/_install
+

diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips
index d2868be..8b3b1b2 100644 (file)
--- a/extra/Configs/Config.mips
+++ b/extra/Configs/Config.mips
@@ -174,7 +174,6 @@ SHARED_LIB_LOADER_PATH = $(DEVEL_PREFIX)/lib
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
@@ -187,9 +186,17 @@ DEVEL_PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
 # 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 = /usr
+SYSTEM_DEVEL_PREFIX = $(DEVEL_PREFIX)
+
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
 
 # If you want 'make install' to install everything under a temporary
-# directory, then define PREFIX during the install step,
+# directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
-PREFIX = $(TOPDIR)/_install
+#PREFIX = $(TOPDIR)/_install
+

diff --git a/extra/Configs/Config.mipsel b/extra/Configs/Config.mipsel
index c5df6ce..9c2c89d 100644 (file)
--- a/extra/Configs/Config.mipsel
+++ b/extra/Configs/Config.mipsel
@@ -174,7 +174,6 @@ SHARED_LIB_LOADER_PATH = /lib
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
@@ -187,9 +186,17 @@ DEVEL_PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
 # 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 = /usr
+SYSTEM_DEVEL_PREFIX = $(DEVEL_PREFIX)
+
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
 
 # If you want 'make install' to install everything under a temporary
-# directory, then define PREFIX during the install step,
+# directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
-PREFIX = $(TOPDIR)/_install
+#PREFIX = $(TOPDIR)/_install
+

diff --git a/extra/Configs/Config.powerpc b/extra/Configs/Config.powerpc
index 3c8ab7a..c93590e 100644 (file)
--- a/extra/Configs/Config.powerpc
+++ b/extra/Configs/Config.powerpc
@@ -176,7 +176,6 @@ SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
@@ -185,13 +184,21 @@ 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.
+# 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)
 
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
+
 # If you want 'make install' to install everything under a temporary
 # directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
 #PREFIX = $(TOPDIR)/_install
+

diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh
index a46b823..0bf18d9 100644 (file)
--- a/extra/Configs/Config.sh
+++ b/extra/Configs/Config.sh
@@ -193,7 +193,6 @@ SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
@@ -206,9 +205,17 @@ DEVEL_PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
 # 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
+SYSTEM_DEVEL_PREFIX = $(DEVEL_PREFIX)
+
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
 
 # If you want 'make install' to install everything under a temporary
 # directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
 #PREFIX = $(TOPDIR)/_install
+

diff --git a/extra/Configs/Config.sparc b/extra/Configs/Config.sparc
index bfd3c69..00dc30f 100644 (file)
--- a/extra/Configs/Config.sparc
+++ b/extra/Configs/Config.sparc
@@ -181,7 +181,6 @@ SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
@@ -190,13 +189,21 @@ 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.
+# 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)
 
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
+
 # If you want 'make install' to install everything under a temporary
 # directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
 #PREFIX = $(TOPDIR)/_install
+

diff --git a/extra/Configs/Config.v850e b/extra/Configs/Config.v850e
index ba60a83..39b5f8f 100644 (file)
--- a/extra/Configs/Config.v850e
+++ b/extra/Configs/Config.v850e
@@ -175,22 +175,29 @@ SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 # environment will be installed.   The result will look something 
 # like the following:
 #   DEVEL_PREFIX/
-#      bin/            <contains gcc, ld, etc>
 #      lib/            <contains all runtime and static libs>
 #      include/        <Where all the header files go>
 # This value is used by the 'make install' Makefile target.  Since this
 # directory is compiled into the uclibc cross compiler spoofer, you
 # have to recompile if you change this value...
-DEVEL_PREFIX = $(DESTDIR)/$(TARGET_ARCH)-uclibc
+DEVEL_PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
 
 # SYSTEM_DEVEL_PREFIX is the directory prefix used when installing
 # 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 = $(DESTDIR)
+SYSTEM_DEVEL_PREFIX = $(DEVEL_PREFIX)
+
+# DEVEL_TOOL_PREFIX is the directory prefix used when installing
+# bin/gcc, bin/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 may want to
+# set this to something else.
+DEVEL_TOOL_PREFIX = $(DEVEL_PREFIX)/usr
 
 # If you want 'make install' to install everything under a temporary
 # directory, the define PREFIX during the install step,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
 #PREFIX = $(TOPDIR)/_install
+