Merged r3175:3181 from trunk.

BLFS/gen-makefile.sh

@@ -10,7 +10,7 @@ declare PREV_PACKAGE=""
 declare BUILD_SCRIPTS=scripts
 declare TRACKING_DIR=tracking-dir
 
-HEADER="# This file is automatically generated by jhalfs
+HEADER="# This file is automatically generated by gen-makefile.sh
 # YOU MAY NEED TO EDIT THIS FILE MANUALLY
 #
 # Generated on `date \"+%F %X %Z\"`"
@@ -247,6 +247,16 @@ EOF
 
 }
 
+if [[ -e Config.in ]] ; then
+  echo -e "\n\tThis script must be run from inside a target package directory.\n"
+  exit 1
+fi
+
+if [[ ! -d scripts ]] ; then
+  echo -e "\n\tNo ./scripts/ directory has been found.\n"
+  exit 1
+fi
+
 generate_Makefile
 
 cp ../progress_bar.sh .

HLFS/master.sh

@@ -473,9 +473,6 @@ EOF
     # Keep the script file name for Makefile dependencies.
     PREV=$this_script
   done  # for file in chapter07/*
-
-  # Add SBU-disk_usage report target if required
-  if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
 }
 
 

README.BLFS

@@ -104,14 +104,16 @@ $Id$
        Next step is to create a book and build scripts in dependencies build order
     for a target package. A target can be a package or a meta-package.
 
+    WARNING:
+           Only one target (meta-package or individual package) must be
+           selected on each configuration run.
+           That is due that there is no way to solve dependencies properly
+           when more than one target are selected at the same time.
+
        Run <make> to launch the configuration interface. The main menu contains
     three block: meta-package selection, individual package selection, and
     build options.
 
-       Only one meta-package or individual package must be selected on each run.
-    That is due that there is no way to solve dependencies properly when
-    more than one target are selected at the same time.
-
        When a meta-package is selected is possible to unselect unwanted components.
     That unselected components will be skipped if no other components depends
     on them.

jhalfs

@@ -127,10 +127,6 @@ case $BRANCH_ID in
     LFSVRS=${BRANCH_ID}
     TREE=branches/${BRANCH_ID#branch-}/BOOK
     ;;
-  2.4-branch )
-    LFSVRS=${BRANCH_ID}
-    TREE=branches/2.4-branch
-    ;;
   * )
     case $PROGNAME in
       lfs | hlfs )