This syncs things up with my local tree. Mainly changes installer

issues, and syns things (as far as I am willing) with Dave Schleef's
tree.  We may need to go another round or so, but we do seem to be
converging...

23 files changed, 344 insertions, 278 deletions

diff --git a/Makefile b/Makefile
index 55fa65f90..136bac1d7 100644
--- a/Makefile
+++ b/Makefile
@@ -43,9 +43,9 @@ Config:
 
 shared:
 	@$(MAKE) -C libc shared
-	@$(MAKE) -C ldso/util
+	@$(MAKE) -C $(LIBRARY_CACHE) ldso/util
 ifeq ($(LDSO_PRESENT), $(TARGET_ARCH))
-	@$(MAKE) -C ldso shared
+	@$(MAKE) -C $(LIBRARY_CACHE) ldso shared
 endif
 	@$(MAKE) -C libcrypt shared
 	@$(MAKE) -C libutil shared
@@ -178,16 +178,19 @@ install: install_dev install_runtime install_gcc
 # directory.
 install_target:
 ifeq ($(DO_SHARED),shared)
-	install -d $(TARGET_PREFIX)/lib
-	install -d $(TARGET_PREFIX)/etc
-	install -d $(TARGET_PREFIX)/sbin
-	install -d $(TARGET_PREFIX)/usr/bin
-	install -m 644 lib/lib*-0.9.5.so $(TARGET_PREFIX)/lib
-	cp -a lib/*.so.* $(TARGET_PREFIX)/lib
+	install -d $(DESTDIR)$(TARGET_PREFIX)/lib
+	install -d $(DESTDIR)$(TARGET_PREFIX)/etc
+	install -d $(DESTDIR)$(TARGET_PREFIX)/sbin
+	install -d $(DESTDIR)$(TARGET_PREFIX)/usr/bin
+	install -m 644 lib/lib*-0.9.5.so $(DESTDIR)$(TARGET_PREFIX)/lib
+	cp -a lib/*.so.* $(DESTDIR)$(TARGET_PREFIX)/lib
 ifeq ($(LDSO_PRESENT),$(TARGET_ARCH))
-	install -m 755 lib/ld-uClibc-0.9.5.so $(TARGET_PREFIX)/lib
-	install -m 755 ldso/util/ldd $(TARGET_PREFIX)/usr/bin
-	install -m 755 ldso/util/ldconfig $(TARGET_PREFIX)/sbin
+	install -m 755 lib/ld-uClibc-0.9.5.so $(DESTDIR)$(TARGET_PREFIX)/lib
+	install -m 755 ldso/util/ldd $(DESTDIR)$(TARGET_PREFIX)/usr/bin
+	install -m 755 ldso/util/readelf $(DESTDIR)$(TARGET_PREFIX)/usr/bin
+	if [ -x ldso/util/ldconfig ] ; then \
+	    install -m 755 ldso/util/ldconfig $(DESTDIR)$(TARGET_PREFIX)/sbin; \
+	fi;
 endif
 ifeq ($(NATIVE_ARCH), $(TARGET_ARCH))
 #	-@if [ -x ldso/util/ldconfig ] ; then ldso/util/ldconfig; fi
@@ -200,19 +203,22 @@ endif
 # libary as the primary libc.
 install_runtime:
 ifeq ($(DO_SHARED),shared)
-	install -d $(DEVEL_PREFIX)/lib
-	install -d $(DEVEL_PREFIX)/etc
-	install -d $(DEVEL_PREFIX)/bin
-	install -m 644 lib/lib*-0.9.5.so $(DEVEL_PREFIX)/lib
-	cp -a lib/*.so.* $(DEVEL_PREFIX)/lib
+	install -d $(DESTDIR)$(DEVEL_PREFIX)/lib
+	install -d $(DESTDIR)$(DEVEL_PREFIX)/etc
+	install -d $(DESTDIR)$(DEVEL_PREFIX)/bin
+	install -m 644 lib/lib*-0.9.5.so $(DESTDIR)$(DEVEL_PREFIX)/lib
+	cp -a lib/*.so.* $(DESTDIR)$(DEVEL_PREFIX)/lib
 ifeq ($(LDSO_PRESENT),$(TARGET_ARCH))
-	install -m 755 lib/ld-uClibc-0.9.5.so $(DEVEL_PREFIX)/lib
-	install -m 755 ldso/util/ldd $(DEVEL_PREFIX)/bin
-	install -m 755 ldso/util/ldconfig $(DEVEL_PREFIX)/bin
-	install -d $(TARGET_PREFIX)/bin
-	ln -fs $(DEVEL_PREFIX)/bin/ldd $(TARGET_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd
-	install -d $(TARGET_PREFIX)/sbin
-	ln -fs $(DEVEL_PREFIX)/sbin/ldconfig $(TARGET_PREFIX)/sbin/$(TARGET_ARCH)-uclibc-ldconfig
+	install -m 755 lib/ld-uClibc-0.9.5.so $(DESTDIR)$(DEVEL_PREFIX)/lib
+	install -m 755 ldso/util/ldd $(DESTDIR)$(DEVEL_PREFIX)/bin
+	install -m 755 ldso/util/readelf $(DESTDIR)$(DEVEL_PREFIX)/bin
+	install -d $(DESTDIR)$(DEVEL_PREFIX)/bin
+	ln -fs $(DEVEL_PREFIX)/bin/ldd $(DESTDIR)$(DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd
+	if [ -x ldso/util/ldconfig ] ; then \
+	    install -m 755 ldso/util/ldconfig $(DESTDIR)$(DEVEL_PREFIX)/bin; \
+	    install -d $(DESTDIR)$(DEVEL_PREFIX)/sbin; \
+	    ln -fs $(DEVEL_PREFIX)/sbin/ldconfig $(DESTDIR)$(DEVEL_PREFIX)/sbin/$(TARGET_ARCH)-uclibc-ldconfig; \
+	fi;
 endif
 endif
 
@@ -220,17 +226,17 @@ endif
 # Installs header files and development library links.
 # DEVEL_PREFIX should be $(PREFIX)/$(target)-linux-uclibc/
 install_dev:
-	install -d $(DEVEL_PREFIX)/lib
-	install -m 644 lib/*.[ao] $(DEVEL_PREFIX)/lib/
+	install -d $(DESTDIR)$(DEVEL_PREFIX)/lib
+	install -m 644 lib/*.[ao] $(DESTDIR)$(DEVEL_PREFIX)/lib/
 ifeq ($(DO_SHARED),shared)
-	find lib/ -type l -name '*.so' -exec cp -a {} $(DEVEL_PREFIX)/lib ';'
+	find lib/ -type l -name '*.so' -exec cp -a {} $(DESTDIR)$(DEVEL_PREFIX)/lib ';'
 ifeq ($(NATIVE_ARCH), $(TARGET_ARCH))
 #	-@if [ -x ldso/util/ldconfig ] ; then ldso/util/ldconfig; fi
 endif
 endif
-	install -d $(DEVEL_PREFIX)/include
+	install -d $(DESTDIR)$(DEVEL_PREFIX)/include
 	find include/ -name '*.h' -depth -follow -exec install \
-	    -D -m 644 {} $(DEVEL_PREFIX)/'{}' ';'
+	    -D -m 644 {} $(DESTDIR)$(DEVEL_PREFIX)/'{}' ';'
 
 install_gcc:
 	$(MAKE) -C extra/gcc-uClibc install
diff --git a/Rules.mak b/Rules.mak
index e518f4f3c..ec50eae35 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -89,13 +89,14 @@ SYSTEM_LDSO=$(shell for each in `$(CC) -print-search-dirs|grep ^libraries|sed -e
 
 ifeq ($(LDSO_PRESENT), $(TARGET_ARCH))
 	LDSO=$(TOPDIR)lib/$(UCLIBC_LDSO)
-	DYNAMIC_LINKER=/lib/$(UCLIBC_LDSO)
+	DYNAMIC_LINKER=$(DESTDIR)$(PREFIX)/lib/$(UCLIBC_LDSO)
 	BUILD_DYNAMIC_LINKER=$(shell cd $(TOPDIR)lib; pwd)/$(UCLIBC_LDSO)
 else
 	LDSO=$(SYSTEM_LDSO)
 	DYNAMIC_LINKER=/lib/$(notdir $(SYSTEM_LDSO))
 	BUILD_DYNAMIC_LINKER=$(shell cd $(TOPDIR)lib; pwd)/$(UCLIBC_LDSO)
 endif
+LIBRARY_CACHE=#-DUSE_CACHE
 
 # Disable libm if HAS_FLOATING_POINT isn't true.
 ifneq ($(HAS_FLOATING_POINT),true)
diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
index d47d3c033..ee2d52804 100644
--- a/extra/Configs/Config.arm
+++ b/extra/Configs/Config.arm
@@ -140,30 +140,29 @@ INCLUDE_IPV6 = false
 DOPIC = false
 
 # PREFIX is the directory prefix that is applied to all installed
-# files.  Typically, it is set to /usr or /usr/local, although it
-# could also be /opt/vendor_name_here/some/random/path/.  The
-# install_runtime makefile target installs a few symbolic links
-# based on PREFIX, not DEVEL_PREFIX.
+# files.  Typically, it is set to /usr or /usr/local, although it could
+# also be /opt/vendor_name_here/some/random/path/.  The install_runtime
+# makefile target installs a few symbolic links based on PREFIX, not
+# DEVEL_PREFIX.
+#
+# DEVEL_PREFIX is the directory where the development environment will
+# be installed.  The uClibc header files are installed into
+# $(DEVEL_PREFIX)/include, static libraries are installed into
+# $(DEVEL_PREFIX)/lib, etc.  This directory is compiled into the uclibc
+# cross compiler spoofer.  Generally, DEVEL_PREFIX should be set to
+# the same thing as $(PREFIX).  DEVEL_PREFIX is used by the Makefile install 
+# targets install_gcc, install_dev, and install_runtime.
 #
-# DEVEL_PREFIX is the directory into which the development environment
-# will be installed.  Include files are installed into
-# $(DEVEL_PREFIX)/include, libraries into $(DEVEL_PREFIX)/lib, etc.
-# This directory is compiled into the uclibc cross compiler spoofer.
-# Generally, DEVEL_PREFIX should be $(PREFIX)/$(TARGET_ARCH)-uclibc-linux.
-# DEVEL_PREFIX is used by the Makefile install targets install_gcc,
-# install_dev, and install_runtime.
-# 
 # TARGET_PREFIX is the directory into which the target runtime
-# environment is installed.  The target runtime environment is
-# what one would use for a embedded system where uclibc is the
-# native libaray.  This will typically be a staging area for
-# creating a root filesystem for the target system, so the default
-# is in the local directory.
+# environment is installed.  The target runtime environment is what one
+# would use for a embedded system where uclibc is the native libaray.
+# This will typically be a staging area for creating a root filesystem
+# for the target system, so the default is in the local directory.
 # 
-# If you want to install to a temporary directory before copying
-# files to their final location, you can change PREFIX after build
-# but before 'make install'.
-PREFIX = /usr
-DEVEL_PREFIX = $(PREFIX)/$(TARGET_ARCH)-linux-uclibc
-TARGET_PREFIX = $(TOPDIR)/_install
+# If you want to install to a temporary directory before copying files
+# to their final location, define DESTDIR during the install step,
+# i.e., 'make install DESTDIR=/home/foo/uclibc/_install'.
+PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
+DEVEL_PREFIX = $(PREFIX)
+TARGET_PREFIX = /
 
diff --git a/extra/Configs/Config.cross.arm.uclinux b/extra/Configs/Config.cross.arm.uclinux
index ea6fcd16b..344273efb 100644
--- a/extra/Configs/Config.cross.arm.uclinux
+++ b/extra/Configs/Config.cross.arm.uclinux
@@ -140,29 +140,28 @@ INCLUDE_IPV6 = false
 DOPIC = false
 
 # PREFIX is the directory prefix that is applied to all installed
-# files.  Typically, it is set to /usr or /usr/local, although it
-# could also be /opt/vendor_name_here/some/random/path/.  The
-# install_runtime makefile target installs a few symbolic links
-# based on PREFIX, not DEVEL_PREFIX.
+# files.  Typically, it is set to /usr or /usr/local, although it could
+# also be /opt/vendor_name_here/some/random/path/.  The install_runtime
+# makefile target installs a few symbolic links based on PREFIX, not
+# DEVEL_PREFIX.
+#
+# DEVEL_PREFIX is the directory where the development environment will
+# be installed.  The uClibc header files are installed into
+# $(DEVEL_PREFIX)/include, static libraries are installed into
+# $(DEVEL_PREFIX)/lib, etc.  This directory is compiled into the uclibc
+# cross compiler spoofer.  Generally, DEVEL_PREFIX should be set to
+# the same thing as $(PREFIX).  DEVEL_PREFIX is used by the Makefile install 
+# targets install_gcc, install_dev, and install_runtime.
 #
-# DEVEL_PREFIX is the directory into which the development environment
-# will be installed.  Include files are installed into
-# $(DEVEL_PREFIX)/include, libraries into $(DEVEL_PREFIX)/lib, etc.
-# This directory is compiled into the uclibc cross compiler spoofer.
-# Generally, DEVEL_PREFIX should be $(PREFIX)/$(TARGET_ARCH)-uclibc-linux.
-# DEVEL_PREFIX is used by the Makefile install targets install_gcc,
-# install_dev, and install_runtime.
-# 
 # TARGET_PREFIX is the directory into which the target runtime
-# environment is installed.  The target runtime environment is
-# what one would use for a embedded system where uclibc is the
-# native libaray.  This will typically be a staging area for
-# creating a root filesystem for the target system, so the default
-# is in the local directory.
+# environment is installed.  The target runtime environment is what one
+# would use for a embedded system where uclibc is the native libaray.
+# This will typically be a staging area for creating a root filesystem
+# for the target system, so the default is in the local directory.
 # 
-# If you want to install to a temporary directory before copying
-# files to their final location, you can change PREFIX after build
-# but before 'make install'.
+# If you want to install to a temporary directory before copying files
+# to their final location, define DESTDIR during the install step,
+# i.e., 'make install DESTDIR=/home/foo/uclibc/_install'.
 PREFIX = /opt/uClinux
 DEVEL_PREFIX = $(PREFIX)/$(TARGET_ARCH)-elf
 TARGET_PREFIX = $(TOPDIR)/_install
diff --git a/extra/Configs/Config.i386 b/extra/Configs/Config.i386
index 387240fdc..7eb9a0095 100644
--- a/extra/Configs/Config.i386
+++ b/extra/Configs/Config.i386
@@ -45,7 +45,7 @@ STRIPTOOL = $(CROSS)strip
 
 # Set the following to `true' to make a debuggable build, and `false' for
 # production builds.
-DODEBUG = false
+DODEBUG = true
 
 # Compiler warnings you want to see 
 WARNINGS=-Wall
@@ -140,30 +140,29 @@ INCLUDE_IPV6 = false
 DOPIC = false
 
 # PREFIX is the directory prefix that is applied to all installed
-# files.  Typically, it is set to /usr or /usr/local, although it
-# could also be /opt/vendor_name_here/some/random/path/.  The
-# install_runtime makefile target installs a few symbolic links
-# based on PREFIX, not DEVEL_PREFIX.
+# files.  Typically, it is set to /usr or /usr/local, although it could
+# also be /opt/vendor_name_here/some/random/path/.  The install_runtime
+# makefile target installs a few symbolic links based on PREFIX, not
+# DEVEL_PREFIX.
+#
+# DEVEL_PREFIX is the directory where the development environment will
+# be installed.  The uClibc header files are installed into
+# $(DEVEL_PREFIX)/include, static libraries are installed into
+# $(DEVEL_PREFIX)/lib, etc.  This directory is compiled into the uclibc
+# cross compiler spoofer.  Generally, DEVEL_PREFIX should be set to
+# the same thing as $(PREFIX).  DEVEL_PREFIX is used by the Makefile install 
+# targets install_gcc, install_dev, and install_runtime.
 #
-# DEVEL_PREFIX is the directory into which the development environment
-# will be installed.  Include files are installed into
-# $(DEVEL_PREFIX)/include, libraries into $(DEVEL_PREFIX)/lib, etc.
-# This directory is compiled into the uclibc cross compiler spoofer.
-# Generally, DEVEL_PREFIX should be $(PREFIX)/$(TARGET_ARCH)-uclibc-linux.
-# DEVEL_PREFIX is used by the Makefile install targets install_gcc,
-# install_dev, and install_runtime.
-# 
 # TARGET_PREFIX is the directory into which the target runtime
-# environment is installed.  The target runtime environment is
-# what one would use for a embedded system where uclibc is the
-# native libaray.  This will typically be a staging area for
-# creating a root filesystem for the target system, so the default
-# is in the local directory.
+# environment is installed.  The target runtime environment is what one
+# would use for a embedded system where uclibc is the native libaray.
+# This will typically be a staging area for creating a root filesystem
+# for the target system, so the default is in the local directory.
 # 
-# If you want to install to a temporary directory before copying
-# files to their final location, you can change PREFIX after build
-# but before 'make install'.
-PREFIX = /usr
-DEVEL_PREFIX = $(PREFIX)/$(TARGET_ARCH)-linux-uclibc
-TARGET_PREFIX = $(TOPDIR)/_install
+# If you want to install to a temporary directory before copying files
+# to their final location, define DESTDIR during the install step,
+# i.e., 'make install DESTDIR=/home/foo/uclibc/_install'.
+PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
+DEVEL_PREFIX = $(PREFIX)
+TARGET_PREFIX = /
 
diff --git a/extra/Configs/Config.m68k b/extra/Configs/Config.m68k
index ef8f4045d..b9447b844 100644
--- a/extra/Configs/Config.m68k
+++ b/extra/Configs/Config.m68k
@@ -154,29 +154,28 @@ OPTIMIZATION = $(DEBUG_CFLAGS)
 
 
 # PREFIX is the directory prefix that is applied to all installed
-# files.  Typically, it is set to /usr or /usr/local, although it
-# could also be /opt/vendor_name_here/some/random/path/.  The
-# install_runtime makefile target installs a few symbolic links
-# based on PREFIX, not DEVEL_PREFIX.
+# files.  Typically, it is set to /usr or /usr/local, although it could
+# also be /opt/vendor_name_here/some/random/path/.  The install_runtime
+# makefile target installs a few symbolic links based on PREFIX, not
+# DEVEL_PREFIX.
+#
+# DEVEL_PREFIX is the directory where the development environment will
+# be installed.  The uClibc header files are installed into
+# $(DEVEL_PREFIX)/include, static libraries are installed into
+# $(DEVEL_PREFIX)/lib, etc.  This directory is compiled into the uclibc
+# cross compiler spoofer.  Generally, DEVEL_PREFIX should be set to
+# the same thing as $(PREFIX).  DEVEL_PREFIX is used by the Makefile install 
+# targets install_gcc, install_dev, and install_runtime.
 #
-# DEVEL_PREFIX is the directory into which the development environment
-# will be installed.  Include files are installed into
-# $(DEVEL_PREFIX)/include, libraries into $(DEVEL_PREFIX)/lib, etc.
-# This directory is compiled into the uclibc cross compiler spoofer.
-# Generally, DEVEL_PREFIX should be $(PREFIX)/$(TARGET_ARCH)-uclibc-linux.
-# DEVEL_PREFIX is used by the Makefile install targets install_gcc,
-# install_dev, and install_runtime.
-# 
 # TARGET_PREFIX is the directory into which the target runtime
-# environment is installed.  The target runtime environment is
-# what one would use for a embedded system where uclibc is the
-# native libaray.  This will typically be a staging area for
-# creating a root filesystem for the target system, so the default
-# is in the local directory.
+# environment is installed.  The target runtime environment is what one
+# would use for a embedded system where uclibc is the native libaray.
+# This will typically be a staging area for creating a root filesystem
+# for the target system, so the default is in the local directory.
 # 
-# If you want to install to a temporary directory before copying
-# files to their final location, you can change PREFIX after build
-# but before 'make install'.
+# If you want to install to a temporary directory before copying files
+# to their final location, define DESTDIR during the install step,
+# i.e., 'make install DESTDIR=/home/foo/uclibc/_install'.
 PREFIX = /opt/uClinux
 DEVEL_PREFIX = $(PREFIX)/$(TARGET_ARCH)-elf
 TARGET_PREFIX = $(TOPDIR)/_install
diff --git a/extra/Configs/Config.m68k.coff b/extra/Configs/Config.m68k.coff
index 8fb8b83f2..541089407 100644
--- a/extra/Configs/Config.m68k.coff
+++ b/extra/Configs/Config.m68k.coff
@@ -156,30 +156,28 @@ OPTIMIZATION = $(DEBUG_CFLAGS)
 HAVE_ELF = false
 
 # PREFIX is the directory prefix that is applied to all installed
-# files.  Typically, it is set to /usr or /usr/local, although it
-# could also be /opt/vendor_name_here/some/random/path/.  The
-# install_runtime makefile target installs a few symbolic links
-# based on PREFIX, not DEVEL_PREFIX.
+# files.  Typically, it is set to /usr or /usr/local, although it could
+# also be /opt/vendor_name_here/some/random/path/.  The install_runtime
+# makefile target installs a few symbolic links based on PREFIX, not
+# DEVEL_PREFIX.
+#
+# DEVEL_PREFIX is the directory where the development environment will
+# be installed.  The uClibc header files are installed into
+# $(DEVEL_PREFIX)/include, static libraries are installed into
+# $(DEVEL_PREFIX)/lib, etc.  This directory is compiled into the uclibc
+# cross compiler spoofer.  Generally, DEVEL_PREFIX should be set to
+# the same thing as $(PREFIX).  DEVEL_PREFIX is used by the Makefile install 
+# targets install_gcc, install_dev, and install_runtime.
 #
-# DEVEL_PREFIX is the directory into which the development environment
-# will be installed.  Include files are installed into
-# $(DEVEL_PREFIX)/include, libraries into $(DEVEL_PREFIX)/lib, etc.
-# This directory is compiled into the uclibc cross compiler spoofer.
-# Generally, DEVEL_PREFIX should be $(PREFIX)/$(TARGET_ARCH)-uclibc-linux.
-# DEVEL_PREFIX is used by the Makefile install targets install_gcc,
-# install_dev, and install_runtime.
-# 
 # TARGET_PREFIX is the directory into which the target runtime
-# environment is installed.  The target runtime environment is
-# what one would use for a embedded system where uclibc is the
-# native libaray.  This will typically be a staging area for
-# creating a root filesystem for the target system, so the default
-# is in the local directory.
+# environment is installed.  The target runtime environment is what one
+# would use for a embedded system where uclibc is the native libaray.
+# This will typically be a staging area for creating a root filesystem
+# for the target system, so the default is in the local directory.
 # 
-# If you want to install to a temporary directory before copying
-# files to their final location, you can change PREFIX after build
-# but before 'make install'.
-
+# If you want to install to a temporary directory before copying files
+# to their final location, define DESTDIR during the install step,
+# i.e., 'make install DESTDIR=/home/foo/uclibc/_install'.
 PREFIX = /opt/uClinux
 DEVEL_PREFIX = $(PREFIX)/$(TARGET_ARCH)-coff
 TARGET_PREFIX = $(TOPDIR)/_install
diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips
index 7c111a505..4f8a38c7f 100644
--- a/extra/Configs/Config.mips
+++ b/extra/Configs/Config.mips
@@ -140,30 +140,29 @@ INCLUDE_IPV6 = false
 DOPIC = false
 
 # PREFIX is the directory prefix that is applied to all installed
-# files.  Typically, it is set to /usr or /usr/local, although it
-# could also be /opt/vendor_name_here/some/random/path/.  The
-# install_runtime makefile target installs a few symbolic links
-# based on PREFIX, not DEVEL_PREFIX.
+# files.  Typically, it is set to /usr or /usr/local, although it could
+# also be /opt/vendor_name_here/some/random/path/.  The install_runtime
+# makefile target installs a few symbolic links based on PREFIX, not
+# DEVEL_PREFIX.
+#
+# DEVEL_PREFIX is the directory where the development environment will
+# be installed.  The uClibc header files are installed into
+# $(DEVEL_PREFIX)/include, static libraries are installed into
+# $(DEVEL_PREFIX)/lib, etc.  This directory is compiled into the uclibc
+# cross compiler spoofer.  Generally, DEVEL_PREFIX should be set to
+# the same thing as $(PREFIX).  DEVEL_PREFIX is used by the Makefile install 
+# targets install_gcc, install_dev, and install_runtime.
 #
-# DEVEL_PREFIX is the directory into which the development environment
-# will be installed.  Include files are installed into
-# $(DEVEL_PREFIX)/include, libraries into $(DEVEL_PREFIX)/lib, etc.
-# This directory is compiled into the uclibc cross compiler spoofer.
-# Generally, DEVEL_PREFIX should be $(PREFIX)/$(TARGET_ARCH)-uclibc-linux.
-# DEVEL_PREFIX is used by the Makefile install targets install_gcc,
-# install_dev, and install_runtime.
-# 
 # TARGET_PREFIX is the directory into which the target runtime
-# environment is installed.  The target runtime environment is
-# what one would use for a embedded system where uclibc is the
-# native libaray.  This will typically be a staging area for
-# creating a root filesystem for the target system, so the default
-# is in the local directory.
+# environment is installed.  The target runtime environment is what one
+# would use for a embedded system where uclibc is the native libaray.
+# This will typically be a staging area for creating a root filesystem
+# for the target system, so the default is in the local directory.
 # 
-# If you want to install to a temporary directory before copying
-# files to their final location, you can change PREFIX after build
-# but before 'make install'.
-PREFIX = /usr
-DEVEL_PREFIX = $(PREFIX)/$(TARGET_ARCH)-linux-uclibc
-TARGET_PREFIX = $(TOPDIR)/_install
+# If you want to install to a temporary directory before copying files
+# to their final location, define DESTDIR during the install step,
+# i.e., 'make install DESTDIR=/home/foo/uclibc/_install'.
+PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
+DEVEL_PREFIX = $(PREFIX)
+TARGET_PREFIX = /
 
diff --git a/extra/Configs/Config.mipsel b/extra/Configs/Config.mipsel
index 7c111a505..4f8a38c7f 100644
--- a/extra/Configs/Config.mipsel
+++ b/extra/Configs/Config.mipsel
@@ -140,30 +140,29 @@ INCLUDE_IPV6 = false
 DOPIC = false
 
 # PREFIX is the directory prefix that is applied to all installed
-# files.  Typically, it is set to /usr or /usr/local, although it
-# could also be /opt/vendor_name_here/some/random/path/.  The
-# install_runtime makefile target installs a few symbolic links
-# based on PREFIX, not DEVEL_PREFIX.
+# files.  Typically, it is set to /usr or /usr/local, although it could
+# also be /opt/vendor_name_here/some/random/path/.  The install_runtime
+# makefile target installs a few symbolic links based on PREFIX, not
+# DEVEL_PREFIX.
+#
+# DEVEL_PREFIX is the directory where the development environment will
+# be installed.  The uClibc header files are installed into
+# $(DEVEL_PREFIX)/include, static libraries are installed into
+# $(DEVEL_PREFIX)/lib, etc.  This directory is compiled into the uclibc
+# cross compiler spoofer.  Generally, DEVEL_PREFIX should be set to
+# the same thing as $(PREFIX).  DEVEL_PREFIX is used by the Makefile install 
+# targets install_gcc, install_dev, and install_runtime.
 #
-# DEVEL_PREFIX is the directory into which the development environment
-# will be installed.  Include files are installed into
-# $(DEVEL_PREFIX)/include, libraries into $(DEVEL_PREFIX)/lib, etc.
-# This directory is compiled into the uclibc cross compiler spoofer.
-# Generally, DEVEL_PREFIX should be $(PREFIX)/$(TARGET_ARCH)-uclibc-linux.
-# DEVEL_PREFIX is used by the Makefile install targets install_gcc,
-# install_dev, and install_runtime.
-# 
 # TARGET_PREFIX is the directory into which the target runtime
-# environment is installed.  The target runtime environment is
-# what one would use for a embedded system where uclibc is the
-# native libaray.  This will typically be a staging area for
-# creating a root filesystem for the target system, so the default
-# is in the local directory.
+# environment is installed.  The target runtime environment is what one
+# would use for a embedded system where uclibc is the native libaray.
+# This will typically be a staging area for creating a root filesystem
+# for the target system, so the default is in the local directory.
 # 
-# If you want to install to a temporary directory before copying
-# files to their final location, you can change PREFIX after build
-# but before 'make install'.
-PREFIX = /usr
-DEVEL_PREFIX = $(PREFIX)/$(TARGET_ARCH)-linux-uclibc
-TARGET_PREFIX = $(TOPDIR)/_install
+# If you want to install to a temporary directory before copying files
+# to their final location, define DESTDIR during the install step,
+# i.e., 'make install DESTDIR=/home/foo/uclibc/_install'.
+PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
+DEVEL_PREFIX = $(PREFIX)
+TARGET_PREFIX = /
 
diff --git a/extra/Configs/Config.powerpc b/extra/Configs/Config.powerpc
index 1bc4978d6..2e2aa692e 100644
--- a/extra/Configs/Config.powerpc
+++ b/extra/Configs/Config.powerpc
@@ -140,30 +140,29 @@ INCLUDE_IPV6 = false
 DOPIC = false
 
 # PREFIX is the directory prefix that is applied to all installed
-# files.  Typically, it is set to /usr or /usr/local, although it
-# could also be /opt/vendor_name_here/some/random/path/.  The
-# install_runtime makefile target installs a few symbolic links
-# based on PREFIX, not DEVEL_PREFIX.
+# files.  Typically, it is set to /usr or /usr/local, although it could
+# also be /opt/vendor_name_here/some/random/path/.  The install_runtime
+# makefile target installs a few symbolic links based on PREFIX, not
+# DEVEL_PREFIX.
+#
+# DEVEL_PREFIX is the directory where the development environment will
+# be installed.  The uClibc header files are installed into
+# $(DEVEL_PREFIX)/include, static libraries are installed into
+# $(DEVEL_PREFIX)/lib, etc.  This directory is compiled into the uclibc
+# cross compiler spoofer.  Generally, DEVEL_PREFIX should be set to
+# the same thing as $(PREFIX).  DEVEL_PREFIX is used by the Makefile install 
+# targets install_gcc, install_dev, and install_runtime.
 #
-# DEVEL_PREFIX is the directory into which the development environment
-# will be installed.  Include files are installed into
-# $(DEVEL_PREFIX)/include, libraries into $(DEVEL_PREFIX)/lib, etc.
-# This directory is compiled into the uclibc cross compiler spoofer.
-# Generally, DEVEL_PREFIX should be $(PREFIX)/$(TARGET_ARCH)-uclibc-linux.
-# DEVEL_PREFIX is used by the Makefile install targets install_gcc,
-# install_dev, and install_runtime.
-# 
 # TARGET_PREFIX is the directory into which the target runtime
-# environment is installed.  The target runtime environment is
-# what one would use for a embedded system where uclibc is the
-# native libaray.  This will typically be a staging area for
-# creating a root filesystem for the target system, so the default
-# is in the local directory.
+# environment is installed.  The target runtime environment is what one
+# would use for a embedded system where uclibc is the native libaray.
+# This will typically be a staging area for creating a root filesystem
+# for the target system, so the default is in the local directory.
 # 
-# If you want to install to a temporary directory before copying
-# files to their final location, you can change PREFIX after build
-# but before 'make install'.
-PREFIX = /usr
-DEVEL_PREFIX = $(PREFIX)/$(TARGET_ARCH)-linux-uclibc
+# If you want to install to a temporary directory before copying files
+# to their final location, define DESTDIR during the install step,
+# i.e., 'make install DESTDIR=/home/foo/uclibc/_install'.
+PREFIX = /usr/$(TARGET_ARCH)-linux-uclibc
+DEVEL_PREFIX = $(PREFIX)
 TARGET_PREFIX = $(TOPDIR)/_install
 
diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh
index 6e36ccee8..dc8cb0c35 100644
--- a/extra/Configs/Config.sh
+++ b/extra/Configs/Config.sh
@@ -161,29 +161,28 @@ INCLUDE_IPV6 = false
 DOPIC = false
 
 # PREFIX is the directory prefix that is applied to all installed
-# files.  Typically, it is set to /usr or /usr/local, although it
-# could also be /opt/vendor_name_here/some/random/path/.  The
-# install_runtime makefile target installs a few symbolic links
-# based on PREFIX, not DEVEL_PREFIX.
+# files.  Typically, it is set to /usr or /usr/local, although it could
+# also be /opt/vendor_name_here/some/random/path/.  The install_runtime
+# makefile target installs a few symbolic links based on PREFIX, not
+# DEVEL_PREFIX.
+#
+# DEVEL_PREFIX is the directory where the development environment will
+# be installed.  The uClibc header files are installed into
+# $(DEVEL_PREFIX)/include, static libraries are installed into
+# $(DEVEL_PREFIX)/lib, etc.  This directory is compiled into the uclibc
+# cross compiler spoofer.  Generally, DEVEL_PREFIX should be set to
+# the same thing as $(PREFIX).  DEVEL_PREFIX is used by the Makefile install 
+# targets install_gcc, install_dev, and install_runtime.
 #
-# DEVEL_PREFIX is the directory into which the development environment
-# will be installed.  Include files are installed into
-# $(DEVEL_PREFIX)/include, libraries into $(DEVEL_PREFIX)/lib, etc.
-# This directory is compiled into the uclibc cross compiler spoofer.
-# Generally, DEVEL_PREFIX should be $(PREFIX)/$(TARGET_ARCH)-uclibc-linux.
-# DEVEL_PREFIX is used by the Makefile install targets install_gcc,
-# install_dev, and install_runtime.
-# 
 # TARGET_PREFIX is the directory into which the target runtime
-# environment is installed.  The target runtime environment is
-# what one would use for a embedded system where uclibc is the
-# native libaray.  This will typically be a staging area for
-# creating a root filesystem for the target system, so the default
-# is in the local directory.
+# environment is installed.  The target runtime environment is what one
+# would use for a embedded system where uclibc is the native libaray.
+# This will typically be a staging area for creating a root filesystem
+# for the target system, so the default is in the local directory.
 # 
-# If you want to install to a temporary directory before copying
-# files to their final location, you can change PREFIX after build
-# but before 'make install'.
+# If you want to install to a temporary directory before copying files
+# to their final location, define DESTDIR during the install step,
+# i.e., 'make install DESTDIR=/home/foo/uclibc/_install'.
 PREFIX = /opt/uClinux
 DEVEL_PREFIX = $(PREFIX)/$(TARGET_ARCH)-elf
 TARGET_PREFIX = $(TOPDIR)/_install
diff --git a/extra/gcc-uClibc/Makefile b/extra/gcc-uClibc/Makefile
index e91a2550e..bb80345bb 100644
--- a/extra/gcc-uClibc/Makefile
+++ b/extra/gcc-uClibc/Makefile
@@ -11,6 +11,7 @@ all: gcc-uClibc ld-uClibc
 
 gcc-uClibc.h: $(TOPDIR)/Config
 	@echo "/* this file was autogenerated by make */" > gcc-uClibc.h
+	@echo "#define UCLIBC_TARGET_PREFIX " \"$(TARGET_PREFIX)\" >> gcc-uClibc.h
 	@echo "#define UCLIBC_DEVEL_PREFIX " \"$(DEVEL_PREFIX)\" >> gcc-uClibc.h
 	@echo "#define UCLIBC_BUILD_DIR " \"$(UCLIBC_DIR)/\" >> gcc-uClibc.h
 	@echo "#define GCC_BIN " \"$(GCC_BIN)\" >> gcc-uClibc.h
@@ -31,18 +32,17 @@ ld-uClibc:
 	chmod a+x $(TARGET_ARCH)-uclibc-ld
 
 install: all
-	install -d $(DEVEL_PREFIX)/bin;
-	install -d $(DEVEL_PREFIX)/usr/bin;
-	install -m 755 $(TARGET_ARCH)-uclibc-gcc $(DEVEL_PREFIX)/usr/bin/
-	install -m 755 $(TARGET_ARCH)-uclibc-ld $(DEVEL_PREFIX)/usr/bin/
-	ln -fs $(TARGET_ARCH)-uclibc-gcc $(DEVEL_PREFIX)/usr/bin/$(TARGET_ARCH)-uclibc-cc
-	ln -fs $(DEVEL_PREFIX)/usr/bin/$(TARGET_ARCH)-uclibc-gcc $(DEVEL_PREFIX)/bin/gcc
-	ln -fs $(DEVEL_PREFIX)/usr/bin/$(TARGET_ARCH)-uclibc-gcc $(DEVEL_PREFIX)/bin/cc
-	ln -fs $(DEVEL_PREFIX)/usr/bin/$(TARGET_ARCH)-uclibc-ld $(DEVEL_PREFIX)/bin/ld
+	install -d $(DESTDIR)$(DEVEL_PREFIX)/bin;
+	install -m 755 $(TARGET_ARCH)-uclibc-gcc $(DESTDIR)$(DEVEL_PREFIX)/bin/
+	install -m 755 $(TARGET_ARCH)-uclibc-ld $(DESTDIR)$(DEVEL_PREFIX)/bin/
+	ln -fs $(TARGET_ARCH)-uclibc-gcc $(DESTDIR)$(DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc
+	ln -fs $(DESTDIR)$(DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(DESTDIR)$(DEVEL_PREFIX)/bin/gcc
+	ln -fs $(DESTDIR)$(DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(DESTDIR)$(DEVEL_PREFIX)/bin/cc
+	ln -fs $(DESTDIR)$(DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(DESTDIR)$(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}` $(DEVEL_PREFIX)/bin/$${app}; \
-	  ln -fs `which $(CROSS)$${app}` $(DEVEL_PREFIX)/usr/