Use consistant paths

5 files changed, 34 insertions, 34 deletions

diff --git a/extra/Configs/Config.m68k b/extra/Configs/Config.m68k
index d53278fb5..77fc37816 100644
--- a/extra/Configs/Config.m68k
+++ b/extra/Configs/Config.m68k
@@ -162,7 +162,7 @@ BUILD_UCLIBC_LDSO=false
 # BIG FAT WARNING:  
 # If you do not have a shared library loader with the correct name
 # sitting in the directory this points to, your binaries will not run.
-#SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
+SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 
 # DEVEL_PREFIX is the directory into which the uClibc development
 # environment will be installed.   The result will look something 
@@ -174,14 +174,14 @@ BUILD_UCLIBC_LDSO=false
 # 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 = /opt/uClinux/$(TARGET_ARCH)-elf
+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 = /
+# 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/Configs/Config.mips b/extra/Configs/Config.mips
index 2a51ea0a2..e17d41f97 100644
--- a/extra/Configs/Config.mips
+++ b/extra/Configs/Config.mips
@@ -149,7 +149,7 @@ BUILD_UCLIBC_LDSO=false
 # BIG FAT WARNING:  
 # If you do not have a shared library loader with the correct name
 # sitting in the directory this points to, your binaries will not run.
-#SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
+SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 
 # DEVEL_PREFIX is the directory into which the uClibc development
 # environment will be installed.   The result will look something 
@@ -164,11 +164,11 @@ BUILD_UCLIBC_LDSO=false
 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/Configs/Config.mipsel b/extra/Configs/Config.mipsel
index 2a51ea0a2..e17d41f97 100644
--- a/extra/Configs/Config.mipsel
+++ b/extra/Configs/Config.mipsel
@@ -149,7 +149,7 @@ BUILD_UCLIBC_LDSO=false
 # BIG FAT WARNING:  
 # If you do not have a shared library loader with the correct name
 # sitting in the directory this points to, your binaries will not run.
-#SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
+SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 
 # DEVEL_PREFIX is the directory into which the uClibc development
 # environment will be installed.   The result will look something 
@@ -164,11 +164,11 @@ BUILD_UCLIBC_LDSO=false
 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/Configs/Config.sh b/extra/Configs/Config.sh
index 0380b8715..580161be6 100644
--- a/extra/Configs/Config.sh
+++ b/extra/Configs/Config.sh
@@ -170,7 +170,7 @@ BUILD_UCLIBC_LDSO=false
 # BIG FAT WARNING:  
 # If you do not have a shared library loader with the correct name
 # sitting in the directory this points to, your binaries will not run.
-#SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
+SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 
 # DEVEL_PREFIX is the directory into which the uClibc development
 # environment will be installed.   The result will look something 
@@ -182,14 +182,14 @@ BUILD_UCLIBC_LDSO=false
 # 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 = /opt/uClinux/$(TARGET_ARCH)-elf
+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 = /
+# 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,
@@ -197,4 +197,3 @@ SYSTEM_DEVEL_PREFIX = /
 #PREFIX = $(TOPDIR)/_install
 PREFIX =
 
-
diff --git a/extra/Configs/Config.v850e b/extra/Configs/Config.v850e
index c5000c668..4c80cad65 100644
--- a/extra/Configs/Config.v850e
+++ b/extra/Configs/Config.v850e
@@ -151,7 +151,7 @@ BUILD_UCLIBC_LDSO=false
 # BIG FAT WARNING:  
 # If you do not have a shared library loader with the correct name
 # sitting in the directory this points to, your binaries will not run.
-#SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
+SHARED_LIB_LOADER_PATH=$(DEVEL_PREFIX)/lib
 
 # DEVEL_PREFIX is the directory into which the uClibc development
 # environment will be installed.   The result will look something 
@@ -163,17 +163,18 @@ BUILD_UCLIBC_LDSO=false
 # 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)
+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,
 # i.e., 'make PREFIX=/var/tmp/uClibc install'.
 #PREFIX = $(TOPDIR)/_install
 PREFIX =
+