From c3bbc0eafdae7a50c46ec61f3352821b7c28ea85 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 8 Aug 2001 17:03:36 +0000 Subject: 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... --- extra/Configs/Config.arm | 45 ++++++++++++++++---------------- extra/Configs/Config.cross.arm.uclinux | 39 ++++++++++++++-------------- extra/Configs/Config.i386 | 47 +++++++++++++++++----------------- extra/Configs/Config.m68k | 39 ++++++++++++++-------------- extra/Configs/Config.m68k.coff | 40 ++++++++++++++--------------- extra/Configs/Config.mips | 45 ++++++++++++++++---------------- extra/Configs/Config.mipsel | 45 ++++++++++++++++---------------- extra/Configs/Config.powerpc | 43 +++++++++++++++---------------- extra/Configs/Config.sh | 39 ++++++++++++++-------------- extra/gcc-uClibc/Makefile | 20 +++++++-------- 10 files changed, 196 insertions(+), 206 deletions(-) (limited to 'extra') 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/bin/$(TARGET_ARCH)-uclibc-$${app}; \ + ln -fs `which $(CROSS)$${app}` $(DESTDIR)$(DEVEL_PREFIX)/bin/$${app}; \ + ln -fs `which $(CROSS)$${app}` $(DESTDIR)$(DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \ done clean: -- cgit v1.2.3