Changeset a16f769 for jhalfs

Timestamp:

10/19/2006 05:27:18 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

a96109a

Parents:

7b6ecc5

Message:

Renamed RE_MAKE to REBUILD_MAKEFILE.
When rebuilding the Makefile we need to know the book version.
Added REBUILD_MAKEFILE to configurations validation.

File:

• jhalfs (modified) (3 diffs)

jhalfs

@@ -109 +109 @@
 GRSECURITY_HOST=${GRSECURITY_HOST:-n}
 CUSTOM_TOOLS=${CUSTOM_TOOLS:-n}
-RE_MAKE=${RE_MAKE:-n}
+REBUILD_MAKEFILE=${REBUILD_MAKEFILE:-n}
 
 # Book surces envars
@@ -318 +318 @@
 #
 
-if [[ "$RE_MAKE" = "n" ]] ; then
+if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then
 
   # If $BUILDDIR has subdirectories like tools/ or bin/, stop the run
@@ -426 +426 @@
 fi
 
+# When regeneration the Makefile we need to know also the canonical book version
+if [[ "$REBUILD_MAKEFILE" = "y" ]] ; then
+  case $PROGNAME in
+    clfs | clfs2 )
+      VERSION=$(xmllint --noent $JHALFSDIR/$BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
+    *)
+      VERSION=$(xmllint --noent $JHALFSDIR/$BOOK/prologue/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//')  ;;
+  esac
+fi
+
 build_Makefile
 if [[ "${PROGNAME}" = "lfs" ]]; then