r2894 - jhalfs/trunk/CLFS2

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Aug 6 01:53:05 PDT 2006


Author: manuel
Date: 2006-08-06 02:53:03 -0600 (Sun, 06 Aug 2006)
New Revision: 2894

Modified:
   jhalfs/trunk/CLFS2/clfs2.xsl
   jhalfs/trunk/CLFS2/master.sh
Log:
Merged r2891:2893 from experimental.

Modified: jhalfs/trunk/CLFS2/clfs2.xsl
===================================================================
--- jhalfs/trunk/CLFS2/clfs2.xsl	2006-08-06 08:52:14 UTC (rev 2893)
+++ jhalfs/trunk/CLFS2/clfs2.xsl	2006-08-06 08:53:03 UTC (rev 2894)
@@ -138,10 +138,11 @@
 
   <xsl:template match="replaceable">
     <xsl:choose>
-      <xsl:when test="ancestor::sect1[@id='ch-system-glibc']">
+      <xsl:when test="ancestor::sect1[@id='ch-cross-tools-glibc']">
         <xsl:value-of select="$timezone"/>
       </xsl:when>
-      <xsl:when test="ancestor::sect1[@id='ch-system-groff']">
+      <xsl:when test="ancestor::sect1[@id='ch-cross-tools-groff'] or
+                      ancestor::sect1[@id='ch-system-groff']">
         <xsl:value-of select="$page"/>
       </xsl:when>
       <xsl:when test="ancestor::sect1[@id='ch-bootable-kernel']">

Modified: jhalfs/trunk/CLFS2/master.sh
===================================================================
--- jhalfs/trunk/CLFS2/master.sh	2006-08-06 08:52:14 UTC (rev 2893)
+++ jhalfs/trunk/CLFS2/master.sh	2006-08-06 08:53:03 UTC (rev 2894)
@@ -182,7 +182,7 @@
     esac
     #
     # Set the dependency for the first target.
-    if [ -z $PREV ] ; then PREV=026-settingenvironment ; fi
+    if [ -z $PREV ] ; then PREV=028-creating-sysfile ; fi
 
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile




More information about the alfs-log mailing list