From 3bc607816b576a75677863cd878c08a87fd41023 Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Sat, 3 Mar 2007 12:18:07 +0000
Subject: [PATCH] Unified mk_CUSTOM_TOOLS and mk_BLFS_TOOL targets.

---
 CLFS/master.sh  | 4 ++--
 CLFS2/master.sh | 6 +++---
 CLFS3/master.sh | 2 +-
 LFS/master.sh   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CLFS/master.sh b/CLFS/master.sh
index 9f79863..6f7664b 100644
--- a/CLFS/master.sh
+++ b/CLFS/master.sh
@@ -908,16 +908,16 @@ mk_FINAL:
 
 mk_CUSTOM_TOOLS: mk_FINAL
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
-	  mkdir -p ${TRACKING_DIR}; \\
 	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
+	  mkdir -p ${TRACKING_DIR}; \\
 	  ( source /root/.bash_profile && make CUSTOM_TOOLS ); \\
 	fi;
 	@touch \$@
 
 mk_BLFS_TOOL: mk_CUSTOM_TOOLS
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-	  mkdir -p $TRACKING_DIR; \\
 	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
+	  mkdir -p $TRACKING_DIR; \\
 	  ( source /root/.bash_profile && make BLFS_TOOL ); \\
 	fi
 	@touch \$@
diff --git a/CLFS2/master.sh b/CLFS2/master.sh
index 7295ee2..24d7b97 100644
--- a/CLFS2/master.sh
+++ b/CLFS2/master.sh
@@ -422,7 +422,7 @@ build_Makefile() {            # Construct a Makefile from the book scripts
 (
 cat << EOF
 
-all:	ck_UID mk_SETUP mk_LUSER create-sbu_du-report mk_ROOT
+all:	ck_UID mk_SETUP mk_LUSER create-sbu_du-report mk_CUSTOM_TOOLS mk_BLFS_TOOL mk_ROOT
 	@sudo make restore-luser-env
 	@sudo make do-housekeeping
 	@\$(call echo_finished,$VERSION)
@@ -446,16 +446,16 @@ mk_LUSER: mk_SETUP
 	@touch \$@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
-	\$(call echo_PHASE,CUSTOM_TOOLS)
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
 	  (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
 	  (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
 	fi;
 	@touch \$@
 
 mk_BLFS_TOOL: mk_CUSTOM_TOOLS
-	\$(call echo_PHASE,BLFS_TOOL)
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
 	  (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
 	  (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make BLFS_TOOL"); \\
 	fi;
diff --git a/CLFS3/master.sh b/CLFS3/master.sh
index 1172966..a7b7179 100644
--- a/CLFS3/master.sh
+++ b/CLFS3/master.sh
@@ -493,8 +493,8 @@ mk_LUSER: mk_SETUP
 	@touch \$@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
-	\$(call echo_PHASE,Building CUSTOM_TOOLS);
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
 	  (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
 	  (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
 	fi;
diff --git a/LFS/master.sh b/LFS/master.sh
index ab25eba..4745d9c 100644
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -448,16 +448,16 @@ mk_BOOT: mk_CHROOT
 	@touch \$@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
-	\$(call echo_PHASE,Building CUSTOM_TOOLS)
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
 	  sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
 	  (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
 	fi;
 	@touch \$@
 
 mk_BLFS_TOOL: mk_CUSTOM_TOOLS
-	\$(call echo_PHASE,Building BLFS_TOOL)
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
 	  sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
 	  (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"); \\
 	fi;