Changeset 9e406b5 for jhalfs

Timestamp:

09/12/2005 02:53:48 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:

fbb6b78

Parents:

48d7968

Message:

Fixed some tagging, added a new sed to use 'cat' properly in the Makefile

File:

• jhalfs (modified) (2 diffs)

jhalfs

@@ -256 +256 @@
 
 build_Makefile() {
+  echo -n "Creating Makefile... "
   cd $JHALFSDIR/commands
  
@@ -292 +293 @@
 
         # Drop in the actual commands that were parsed from the book
+        # These seds add an extra $ to each variable so make doesn't break,
+        # add tabs to the beginning of each line, and add ' && \' to the end
+        # of each line except for those that end in '\'.
         cat $i | sed -e 's:\$:&&:g' -e 's:^:\t:' -e 's:[^\\]$:& \&\& \\:' >> $MKFILE.tmp
-        sed -i -e '$s: \&\& \\::' $MKFILE.tmp -e 's|\$\$LFS|\$(LFS)|' $MKFILE.tmp
+        # This sed removes the ' && \' from the last command of each target
+        sed -i '$s: \&\& \\::' $MKFILE.tmp
 
         # Include a touch of the target name so make can check if it's already been made.
         echo -e "\ttouch \$@" >> $MKFILE.tmp
   done
-
-        # 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
-        echo -e "endef\n" >> $MKFILE
-
-        # Drop in the list as the main target 'all:' with each sub-target as a dependency.
-        echo "all: $list" >> $MKFILE
-
-        # Bring over the items from the Makefile.tmp
-        cat $MKFILE.tmp >> $MKFILE
-        rm $MKFILE.tmp
+  # These seds turn the variables '$$LFS' into '$(LFS)' so make will understand,
+  # and remove the ' && \'s from the end of each line of a cat command.
+  sed -i -e 's|\$\$LFS|\$(LFS)|' -e '/^\tcat/,/^\tEOF/s/ \&\& \\//' $MKFILE.tmp
+
+  # 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
+  echo -e "endef\n" >> $MKFILE
+
+  # Drop in the list as the main target 'all:' with each sub-target as a dependency.
+  echo "all: $list" >> $MKFILE
+
+  # Bring over the items from the Makefile.tmp
+  cat $MKFILE.tmp >> $MKFILE
+  rm $MKFILE.tmp
+  echo -ne "done\n"
 }