Make the use of branches clearer, and allow branches to be used

for CLFS

Config.in

@@ -65,12 +65,14 @@ menu "--- BOOK Settings"
 	endchoice
 
 	config	BRANCH_ID
-		string	"Book Version (mandatory)"
+		string	"Stable Version or branch (preceded by branch-)"
 		default	"**EDIT ME**"
 		depends	BRANCH
 		help
-			#-- A list of valid branches and stable book IDs is available here.
+			#-- A list of valid branches and stable book IDs is available here:
 			#   http://wiki.linuxfromscratch.org/alfs/wiki/SupportedBooks
+			#   Enter branch-XXX for branch XXX, and just YYY for tag YYY or
+			#   stable YYY version
 
 	config	BOOK
 		string	"Loc of working copy (mandatory)"

jhalfs

@@ -169,9 +169,17 @@ case $BRANCH_ID in
             echo " Please rerun make and fix the configuration."
             exit 2 ;;
   branch-* )
+    case $PROGNAME in
+      lfs )
         LFSVRS=${BRANCH_ID}
         TREE=branches/${BRANCH_ID#branch-}/BOOK
         ;;
+      clfs* )
+        LFSVRS=${BRANCH_ID}
+        TREE=${BRANCH_ID#branch-}
+        ;;
+    esac
+    ;;
   * )
     case $PROGNAME in
       lfs )