From ee96ad26f9456ec5e786cc998610824b3ac2218d Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Thu, 14 Oct 2021 10:25:48 +0200
Subject: [PATCH] jhalfs: rebuild-makefile. take VERSION from prbook
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When rebuilding the Makefile, we should have prbook.xml in
ĴHALFSDIR. Use it to get VERSION (from lfs-release).
---
 jhalfs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/jhalfs b/jhalfs
index 75e83f1..1a08a79 100755
--- a/jhalfs
+++ b/jhalfs
@@ -478,16 +478,7 @@ if [[ "$REBUILD_MAKEFILE" = "y" ]] ; then
     clfs* )
       VERSION=$(xmllint --noent "$BOOK/prologue/$ARCH/bookinfo.xml" 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
     lfs)
-      version_is_in=general.ent
-      if [ -x $BOOK/git-version.sh ]; then
-        ( cd $BOOK && ./git-version.sh )
-        version_is_in=version.ent
-      fi
-      if [[ "$INITSYS" = "sysv" ]] ; then
-        VERSION=$(grep 'ENTITY version ' "$BOOK/$version_is_in" | cut -d\" -f2)
-      else
-        VERSION=$(grep 'ENTITY versiond' "$BOOK/$version_is_in" | cut -d\" -f2)
-      fi
+      VERSION=$(grep 'echo.*lfs-release' "$JHALFSDIR/prbook.xml" | sed 's/.*echo[ ]*\([^ ]*\).*/\1/')
       ;;
     *)
       VERSION=$(xmllint --noent "$BOOK/prologue/bookinfo.xml" 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;