[alfs-log] r3962 - jhalfs/trunk

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Sun Apr 30 14:50:25 PDT 2017


Author: pierre
Date: Sun Apr 30 14:50:25 2017
New Revision: 3962

Log:
Fix the path to the book used when "Rebuild the Makefile" has been selected

Modified:
   jhalfs/trunk/jhalfs

Modified: jhalfs/trunk/jhalfs
==============================================================================
--- jhalfs/trunk/jhalfs	Mon Apr 10 01:34:27 2017	(r3961)
+++ jhalfs/trunk/jhalfs	Sun Apr 30 14:50:25 2017	(r3962)
@@ -443,16 +443,16 @@
 if [[ "$REBUILD_MAKEFILE" = "y" ]] ; then
   case $PROGNAME in
     clfs* )
-      VERSION=$(xmllint --noent $JHALFSDIR/$BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
+      VERSION=$(xmllint --noent $BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
     lfs)
       if [[ "$INITSYS" = "sysv" ]] ; then
-        VERSION=$(grep 'ENTITY version ' $JHALFSDIR/$BOOK/general.ent| cut -d\" -f2)
+        VERSION=$(grep 'ENTITY version ' $BOOK/general.ent| cut -d\" -f2)
       else
-        VERSION=$(grep 'ENTITY versiond' $JHALFSDIR/$BOOK/general.ent| cut -d\" -f2)
+        VERSION=$(grep 'ENTITY versiond' $BOOK/general.ent| cut -d\" -f2)
       fi
       ;;
     *)
-      VERSION=$(xmllint --noent $JHALFSDIR/$BOOK/prologue/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
+      VERSION=$(xmllint --noent $BOOK/prologue/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
   esac
 fi
 


More information about the alfs-log mailing list