Changeset 56dd1e2

Timestamp:

10/02/2005 02:28:31 PM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

133ecac

Parents:

24530379

Message:

Using PKGDIR in all chapters.

Files:

• dump-lfs-scripts.xsl (modified) (3 diffs)
• jhalfs (modified) (3 diffs)

dump-lfs-scripts.xsl

@@ -45 +45 @@
       <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
         <xsl:text>#!/bin/sh&#xA;&#xA;</xsl:text>
-        <xsl:if test="(sect2[@role='installation'] or
-            @id='ch-tools-adjusting') and
-            ancestor::chapter[@id='chapter-temporary-tools']">
+        <xsl:if test="sect2[@role='installation'] or
+                @id='ch-tools-adjusting' or
+                @id='ch-system-readjusting'">
           <xsl:text>cd $PKGDIR &amp;&amp;&#xA;</xsl:text>
         </xsl:if>
@@ -62 +62 @@
           <xsl:apply-templates select="userinput" mode="screen"/>
           <xsl:if test="position() != last() and
-              not(contains(string(),'EOF')) and
-              not(contains(string(),'check')) and
-              not(ancestor::sect1[@id='ch-tools-stripping'])">
+                  not(contains(string(),'EOF')) and
+                  not(contains(string(),'check')) and
+                  not(ancestor::sect1[@id='ch-tools-stripping'])">
             <xsl:text> &amp;&amp;</xsl:text>
           </xsl:if>
@@ -74 +74 @@
 
   <xsl:template match="para/userinput">
-    <xsl:if test="$testsuite != '0' and (contains(string(),'test') or
-        contains(string(),'check'))">
+    <xsl:if test="$testsuite != '0' and
+            (contains(string(),'test') or
+            contains(string(),'check'))">
       <xsl:value-of select="substring-before(string(),'make')"/>
       <xsl:text>make -k</xsl:text>

jhalfs

@@ -159 +159 @@
   if [ -z $LFSVRS ] ; then LFSVRS=development ; fi
 
-  # Set the book's soures directory
+  # Set the book's sources directory
   if [ -z $BOOK ] ; then BOOK=lfs-$LFSVRS ; fi
 
@@ -461 +461 @@
       echo -e "\t\$(call unpack,$FILE)" >> $MKFILE.tmp
       echo -e "\t-ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\" >> $MKFILE.tmp
-      echo -e "\tcd \$(SRC)/\$\$ROOT && \\" >> $MKFILE.tmp
+      echo -e "\techo \"PKGDIR=\$(SRC)/\$\$ROOT\" > envars && \\" >> $MKFILE.tmp
+      echo -e "\techo \"export PKGDIR\" >> envars && \\" >> $MKFILE.tmp
     fi
 
@@ -469 +470 @@
     # For the Re-Adjusting phase we must to cd to the binutils-build directory.
     if [ "$i" = "067-readjusting" ] ; then
-      echo -e "\tcd \$(SRC)/binutils-build && \\" >> $MKFILE.tmp
+      echo -e "\techo \"PKGDIR=\$(SRC)/binutils-build\" > envars && \\" >> $MKFILE.tmp
+      echo -e "\techo \"export PKGDIR\" >> envars && \\" >> $MKFILE.tmp
     fi