Changeset 48d7968

Timestamp:

09/12/2005 02:04:26 AM (19 years ago)

Author:

Jeremy Huntwork <jhuntwork@…>

Branches:

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

Children:

9e406b5

Parents:

e2caf6f

Message:

Make LFS a variable make understands and add a switch to allow user to specify

File:

• jhalfs (modified) (5 diffs)

jhalfs

@@ -15 +15 @@
   -V, --version                 print version number, then exit
   -L, --LFS-version=VER         use VER version of the LFS book
+  -d  --directory=DIR           use DIR directory for building LFS; all files
+                                jhalfs produces will be in the directory
+                                DIR/jhalfs
   -D, --download-client=CLIENT  use CLIENT as the program for retrieving
                                 packages
@@ -58 +61 @@
                         ;;
 
+                --directory | -d )
+                        test $# = 1 && eval "$exit_missing_arg"
+                        shift
+                        BUILDDIR=$1
+                        shift
+                        ;;
+
                 --download-client | -D )
                         test $# = 1 && eval "$exit_missing_arg"
@@ -93 +103 @@
 SVN="svn://svn.linuxfromscratch.org"
 HTTP=http://ftp.lfs-matrix.net/pub/lfs/lfs-packages/conglomeration
-BUILDDIR=/mnt/lfs
+if [ -z $BUILDDIR ] ; then BUILDDIR=/mnt/lfs ; fi
 JHALFSDIR=$BUILDDIR/jhalfs
 LOG=build.log
@@ -283 +293 @@
         # Drop in the actual commands that were parsed from the book
         cat $i | sed -e 's:\$:&&:g' -e 's:^:\t:' -e 's:[^\\]$:& \&\& \\:' >> $MKFILE.tmp
-        sed -i '$s: \&\& \\::' $MKFILE.tmp
+        sed -i -e '$s: \&\& \\::' $MKFILE.tmp -e 's|\$\$LFS|\$(LFS)|' $MKFILE.tmp
 
         # Include a touch of the target name so make can check if it's already been made.
@@ -291 +301 @@
         # Stick a variable and some defines at the top of the real makefile     
         echo "export SRC := /sources" > $MKFILE
+        echo "export LFS := $BUILDDIR" >> $MKFILE
         echo "define unpack" >> $MKFILE
         echo -e "\t@cd \$(SRC) ; tar -xvf \$(1) > /tmp/unpacked" >> $MKFILE