diff --git a/Config.in b/Config.in index 5523b02..374fd65 100644 --- a/Config.in +++ b/Config.in @@ -562,6 +562,15 @@ menu "BOOK Settings" book sources will be copied or checked out. Do not change that unless you know what you are doing... + config LFS_XML + string "LFS sources directory (internal parameter)" + default "lfs-xml" + depends BLFS_TOOL || BOOK_BLFS + help + The directory name under $BLFS_ROOT where the LFS + book sources will be copied or checked out. Do not change that + unless you know what you are doing... + choice prompt "LFS Release" default LFS_SVN diff --git a/jhalfs b/jhalfs index 40d9137..69e6d61 100755 --- a/jhalfs +++ b/jhalfs @@ -416,12 +416,6 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then cp extras/* $JHALFSDIR/extras fi -# Download or updates the book source - get_book - extract_commands - echo "${SD_BORDER}${nl_}" - cd $CWD # the functions above change directory - # Copy custom tools config files, if requested if [[ "${CUSTOM_TOOLS}" = "y" ]]; then echo "Copying custom tool scripts to $JHALFSDIR" @@ -429,6 +423,14 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then cp -f custom/config/* $JHALFSDIR/custom-commands fi +# Download or updates the book source +# Note that all customization to $JHALFSDIR have to be done before this. +# But the LFS book is needed for BLFS tools. + get_book + extract_commands + echo "${SD_BORDER}${nl_}" + cd $CWD # the functions above change directory + # Install blfs-tool, if requested. if [[ "${BLFS_TOOL}" = "y" ]] ; then echo Installing BLFS book and tools