From 2d0a2e55bd88f773916bc992459fe80f078028c0 Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Mon, 21 Aug 2006 20:03:19 +0000
Subject: [PATCH] Making TRACKING_DIR a configurable value.

---
 BLFS/gen-makefile.sh        |  4 +++-
 BLFS/gen_config.sh          |  6 +++++-
 BLFS/libs/func_dependencies |  2 ++
 Config.in                   | 11 +++++++++++
 blfs                        |  7 ++++---
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/BLFS/gen-makefile.sh b/BLFS/gen-makefile.sh
index 69e91c5..b637b39 100755
--- a/BLFS/gen-makefile.sh
+++ b/BLFS/gen-makefile.sh
@@ -4,12 +4,14 @@
 #
 set -e
 
-
+# Uncomment this when reasy to be used
+#source ../configuration
 
 # TEMPORARY VARIABLES.. development use only
 declare MKFILE=Makefile
 declare PREV_PACKAGE=""
 declare BUILD_SCRIPTS=scripts
+# Remove this when we can use configuration
 declare TRACKING_DIR=/var/lib/jhalfs/BLFS
 
 HEADER="# This file is automatically generated by jhalfs
diff --git a/BLFS/gen_config.sh b/BLFS/gen_config.sh
index 72f660d..e35610e 100755
--- a/BLFS/gen_config.sh
+++ b/BLFS/gen_config.sh
@@ -6,7 +6,7 @@
 export outFile=aConfig.in	# file for reading and writing to.
 export inFile=packages		# file for reading and writing to.
 
-declare TRACKING_DIR=/var/lib/jhalfs/BLFS
+declare TRACKING_DIR=tracking-dir
 
 declare PKG_NAME
 declare PKG_XML_FILE
@@ -236,6 +236,10 @@ config	SUDO
 		Select if sudo will be used (you want build as a normal user)
 		        otherwise sudo is not needed (you want build as root)
 
+config	TRACKING_DIR
+	string
+	default	$TRACKING_DIR
+
 EOF
 ) >> $outFile
 echo "done"
diff --git a/BLFS/libs/func_dependencies b/BLFS/libs/func_dependencies
index 669bc75..e6040dc 100644
--- a/BLFS/libs/func_dependencies
+++ b/BLFS/libs/func_dependencies
@@ -136,6 +136,7 @@ do_dependencies()  {    #  Loop to find sub-dependencies  :::WARNING::: THIS IS
                        $KBR5
                        $GHOSTSCRIPT
                        $MAILSERVER
+                       $TRACKING_DIR
                 file:  depure.txt
                        $TARGET-index.xml.tmp
                        $PKG.dep
@@ -154,6 +155,7 @@ inline_doc
   local saveIFS=$IFS
   local DEP_LV=$DEP_LEVEL
   local line line2 DEP pkg_ver
+  # Remove this when we can use configuration file
   local TRACKING_DIR=/var/lib/jhalfs/BLFS
 
   #------------------
diff --git a/Config.in b/Config.in
index bd1cce7..7f5ee64 100644
--- a/Config.in
+++ b/Config.in
@@ -294,6 +294,17 @@ menu "--- BOOK Settings"
 		help
 			#-- The directory name where BLFS book sources
 			#   will be checkout.
+
+	config	TRACKING_DIR
+		string "Installed packages database directory"
+		default "/var/lib/jhalfs/BLFS"
+		depends on BOOK_BLFS
+		help
+			#-- Full path to the directory where the installed
+			#   packages database will be created.
+			#
+			#   Note that the user that will build the packages must
+			#   have read and write privileges on that directory.
 	#--- End BLFS specific params
 
 #--- End BOOK Settings
diff --git a/blfs b/blfs
index 4c1872f..bb3c737 100755
--- a/blfs
+++ b/blfs
@@ -124,9 +124,10 @@ rm -rf menu/.svn
 rm -rf menu/lxdialog/.svn
 
 
-# Fix BLFS_XML harcoded values
-sed -i 's,blfs-xml,'$BLFS_XML',' update_book.sh
-sed -i 's,blfs-xml,'$BLFS_XML',' libs/book.xsl
+# Set some harcoded values to the proper values
+sed -i 's,blfs-xml,'$BLFS_XML',' update_book.sh libs/book.xsl
+#sed -i 's,blfs-xml,'$BLFS_XML',' libs/book.xsl
+sed -i 's,tracking-dir,'$TRACKING_DIR',' gen_config.sh
 
 # Fetch book sources and create packages and GNOME/KDE dependencies files
 if [[ -d $BLFS_XML ]] ; then