[alfs-log] r3963 - jhalfs/branches/2.4

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Tue May 2 01:36:55 PDT 2017


Author: pierre
Date: Tue May  2 01:36:55 2017
New Revision: 3963

Log:
Merge trunk r3962

Modified:
   jhalfs/branches/2.4/jhalfs

Modified: jhalfs/branches/2.4/jhalfs
==============================================================================
--- jhalfs/branches/2.4/jhalfs	Sun Apr 30 14:50:25 2017	(r3962)
+++ jhalfs/branches/2.4/jhalfs	Tue May  2 01:36:55 2017	(r3963)
@@ -440,16 +440,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