Moved ccache and distcc to the toolchain directory.

diff --git a/lfs/ccache b/lfs/ccache
index ca76ecf465c6823e40bec17130e638acf9cce90e..a2217499c68b1982f9a8bf4a264fa032ba20b76c 100644 (file)
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -31,7 +31,7 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-PREFIX     = $(LFS_BASEDIR)/build_$(MACHINE)/usr/local/ccache
+PREFIX     = $(TOOLS_DIR)/usr
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/distcc b/lfs/distcc
index 7f0843f3cd76c23d6d04073e48b0f6a972016f4b..441fcdc2787b58eb459b6ca07515aaabd2c4e92b 100644 (file)
--- a/lfs/distcc
+++ b/lfs/distcc
@@ -31,7 +31,7 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-PREFIX     = $(LFS_BASEDIR)/build_$(MACHINE)/usr/local/distcc
+PREFIX     = $(TOOLS_DIR)/usr
 
 ###############################################################################
 # Top-level Rules

diff --git a/make.sh b/make.sh
index 3af09adb275c61671a9031ea833d3a55d8504ec0..3660cffce2c369f3ae935004fb0882bbbf7ecd6c 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -38,7 +38,7 @@ SLOGAN="www.ipfire.org"                                       # Software slogan
 toolchain_build() {
 
        ORG_PATH=$PATH
-       export PATH=$BASEDIR/build_${MACHINE}/usr/local/ccache/bin:$BASEDIR/build_${MACHINE}/usr/local/distcc/bin:$BASEDIR/build_${MACHINE}/$CTOOLS_DIR/bin:$BASEDIR/build_${MACHINE}/$TOOLS_DIR/bin:$PATH
+       export PATH=${CTOOLS_DIR}/bin:${TOOLS_DIR}/usr/bin:${TOOLS_DIR}/bin:$PATH
        STAGE_ORDER=01
        STAGE=toolchain
 
@@ -98,7 +98,7 @@ toolchain_build() {
 ################################################################################
 base_build() {
 
-       PATH=/usr/local/ccache/bin:/usr/local/distcc/bin:/bin:/usr/bin:/sbin:/usr/sbin:$TOOLS_DIR/bin
+       PATH=${TOOLS_DIR}/usr/bin:/bin:/usr/bin:/sbin:/usr/sbin:$TOOLS_DIR/bin
        STAGE_ORDER=02
        STAGE=base
 
@@ -162,7 +162,7 @@ base_build() {
 # This builds the entire stage "ipfire"                                        #
 ################################################################################
 ipfire_build() {
-       PATH=/usr/local/ccache/bin:/usr/local/distcc/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/${MACHINE_REAL}-linux/bin
+       PATH=${TOOLS_DIR}/usr/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/${MACHINE_REAL}-linux/bin
        STAGE_ORDER=03
        STAGE=ipfire
 
@@ -304,7 +304,7 @@ ipfire_build() {
 ################################################################################
 misc_build() {
 
-       PATH=/usr/local/ccache/bin:/usr/local/distcc/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/${MACHINE_REAL}-linux/bin
+       PATH=${TOOLS_DIR}/usr/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/${MACHINE_REAL}-linux/bin
        STAGE_ORDER=04
        STAGE=misc
 
@@ -400,7 +400,7 @@ misc_build() {
 ################################################################################
 installer_build() {
 
-       PATH=/usr/local/ccache/bin:/usr/local/distcc/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/${MACHINE_REAL}-linux/bin
+       PATH=${TOOLS_DIR}/usr/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/${MACHINE_REAL}-linux/bin
        STAGE_ORDER=05
        STAGE=installer
 
@@ -418,7 +418,7 @@ installer_build() {
 ################################################################################
 packages_build() {
 
-       PATH=/usr/local/ccache/bin:/usr/local/distcc/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/${MACHINE_REAL}-linux/bin
+       PATH=${TOOLS_DIR}/usr/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/${MACHINE_REAL}-linux/bin
        STAGE_ORDER=06
        STAGE=packages
 

diff --git a/tools/make-include b/tools/make-include
index 6abbb3a546f8f4fab4705978936d4028c933faa1..5421ddf72fc7d09156d6dd7d8b16f82c6dd59547 100644 (file)
--- a/tools/make-include
+++ b/tools/make-include
@@ -339,7 +339,7 @@ exiterror() {
 # This is the function that sets the environment of a chroot and enters it     #
 ################################################################################
 entershell() {
-       PATH=/usr/local/ccache/bin:/usr/local/distcc/bin:/bin:/usr/bin:/sbin:/usr/sbin:$TOOLS_DIR/bin:/usr/${MACHINE_REAL}-linux/bin
+       PATH=${TOOLS_DIR}/usr/bin:/bin:/usr/bin:/sbin:/usr/sbin:${TOOLS_DIR}/bin:/usr/${MACHINE_REAL}-linux/bin
 
        if [ ! -e $LFS/usr/src/lfs/ ]; then
                exiterror "No such file or directory: $LFS/usr/src/lfs/"
@@ -653,13 +653,13 @@ prepareenv() {
        unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
        # Make some extra directories
-       mkdir -p $BASEDIR/build_${MACHINE}/{$TOOLS_DIR,$CTOOLS_DIR,$INSTALLER_DIR,cdrom,images,usr/local/{ccache,distcc}} 2>/dev/null
+       mkdir -p $BASEDIR/build_${MACHINE}/{$TOOLS_DIR,$CTOOLS_DIR,$INSTALLER_DIR,cdrom,images} 2>/dev/null
        mkdir -p $BASEDIR/{cache,ccache,distcc} 2>/dev/null
-       mkdir -p $LFS/{$TOOLS_DIR,$CTOOLS_DIR,usr/src} 2>/dev/null
+       mkdir -p $LFS/{$TOOLS_DIR/usr,$CTOOLS_DIR,usr/src} 2>/dev/null
        mkdir -p $LFS/dev/pts
        mkdir -p $LFS/proc
        mkdir -p $LFS/usr/src/{cache,config,doc,lfs,log_${MACHINE},src,ccache,distcc}
-       mkdir -p $LFS/{$INSTALLER_DIR,cdrom,images,usr/local/{ccache,distcc}}
+       mkdir -p $LFS/{$INSTALLER_DIR,cdrom,images}
        mkdir -p $LFS/etc
 
        mknod -m 600 $BASEDIR/build/dev/console c 5 1 2>/dev/null
@@ -681,8 +681,6 @@ prepareenv() {
        mount --bind $BASEDIR/build_${MACHINE}/$INSTALLER_DIR                   $LFS/$INSTALLER_DIR
        mount --bind $BASEDIR/build_${MACHINE}/$CDROM_DIR                                       $LFS/$CDROM_DIR
        mount --bind $BASEDIR/build_${MACHINE}/$IMAGES_DIR                              $LFS/$IMAGES_DIR
-       mount --bind $BASEDIR/build_${MACHINE}/usr/local/ccache         $LFS/usr/local/ccache
-       mount --bind $BASEDIR/build_${MACHINE}/usr/local/distcc         $LFS/usr/local/distcc
 
        # Run LFS static binary creation scripts one by one
        export CCACHE_DIR=$BASEDIR/ccache