From 1503465db49c0608a3e918d9a331c9b1d814f392 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Tue, 2 May 2017 08:36:55 +0000 Subject: [PATCH] Merge trunk r3962 --- jhalfs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jhalfs b/jhalfs index 8e60bf5..a436296 100755 --- a/jhalfs +++ b/jhalfs @@ -440,16 +440,16 @@ fi 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