Unified mk_CUSTOM_TOOLS and mk_BLFS_TOOL targets.

This commit is contained in:
Manuel Canales Esparcia 2007-03-03 12:18:07 +00:00
parent daa489df5d
commit 3bc607816b
4 changed files with 8 additions and 8 deletions

View file

@ -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 \$@

View file

@ -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;

View file

@ -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;

View file

@ -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;