Changeset 81f7dc1 for CLFS2

Timestamp:

02/16/2007 06:24:19 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

ddca240

Parents:

dcf0e25

Message:

Make SHELL=/bin/bash a Makefile variable instead using it inside the sub-make invocations to avoid be propagated to make processes started by the actual build scripts.

File:

• CLFS2/master.sh (modified) (4 diffs)

CLFS2/master.sh

@@ -438 +438 @@
 mk_SETUP:
         @\$(call echo_SU_request)
-        @sudo make SHELL=/bin/bash SETUP
+        @sudo make SETUP
         @touch \$@
 
 mk_LUSER: mk_SETUP
         @\$(call echo_SULUSER_request)
-        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash LUSER" )
+        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
         @touch \$@
 
@@ -450 +450 @@
         @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
           (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
-          (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash CUSTOM_TOOLS"); \\
+          (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
         fi;
         @touch \$@
@@ -458 +458 @@
         @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
           (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
-          (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash BLFS_TOOL"); \\
+          (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make BLFS_TOOL"); \\
         fi;
         @touch \$@
@@ -466 +466 @@
         @echo "$VERSION-sysroot - jhalfs build" > clfs-release && \\
         sudo mv clfs-release \$(MOUNT_PT)/etc
-        @sudo make SHELL=/bin/bash ROOT
+        @sudo make ROOT
         @touch \$@