From 96a30c7a239f82270b4601bff0bfee2eb75a7607 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Thu, 23 Feb 2012 17:42:27 +0000
Subject: [PATCH] Adds -j1 to "make install", impose a dependency on preceding
 package in X* chapter

---
 BLFS/gen-special.sh       | 10 ++++++++++
 BLFS/xsl/gen_pkg_list.xsl | 16 ++++++++++++++++
 BLFS/xsl/scripts.xsl      | 36 +++++++++++++++++++++++++++++-------
 3 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/BLFS/gen-special.sh b/BLFS/gen-special.sh
index a564acb..c96e68e 100755
--- a/BLFS/gen-special.sh
+++ b/BLFS/gen-special.sh
@@ -74,6 +74,16 @@ cat >$SPECIAL_FILE << EOF
           </xsl:element>
         </xsl:if>
 <!-- Dependencies -->
+        <xsl:text>
+            </xsl:text>
+        <xsl:element name="dependency">
+          <xsl:attribute name="status">required</xsl:attribute>
+          <xsl:attribute name="name">
+            <xsl:value-of
+              select="preceding-sibling::sect1[1]/@id"/>
+          </xsl:attribute>
+          <xsl:attribute name="type">ref</xsl:attribute>
+        </xsl:element>
         <xsl:apply-templates select=".//para[@role='required' or
                                              @role='recommended' or
                                              @role='optional']"
diff --git a/BLFS/xsl/gen_pkg_list.xsl b/BLFS/xsl/gen_pkg_list.xsl
index bd04d52..f676f41 100644
--- a/BLFS/xsl/gen_pkg_list.xsl
+++ b/BLFS/xsl/gen_pkg_list.xsl
@@ -202,6 +202,22 @@
             </xsl:element>
           </xsl:if>
 <!-- Dependencies -->
+<!-- If in Xorg chapter, consider that the preceding package is
+     the first dependency (not always noted in the book) -->
+          <xsl:if test="ancestor::chapter[@id='x-window-system'] and
+                        preceding-sibling::sect1[@id != 'xorg7']">
+            <xsl:text>
+            </xsl:text>
+            <xsl:element name="dependency">
+              <xsl:attribute name="status">required</xsl:attribute>
+              <xsl:attribute name="name">
+                <xsl:value-of
+                  select="preceding-sibling::sect1[1]/@id"/>
+              </xsl:attribute>
+              <xsl:attribute name="type">ref</xsl:attribute>
+            </xsl:element>
+
+          </xsl:if>
           <xsl:apply-templates select=".//para[@role='required' or
                                                @role='recommended' or
                                                @role='optional']"
diff --git a/BLFS/xsl/scripts.xsl b/BLFS/xsl/scripts.xsl
index 1727814..62aeabf 100644
--- a/BLFS/xsl/scripts.xsl
+++ b/BLFS/xsl/scripts.xsl
@@ -372,13 +372,20 @@ mv ../${sect_ver}.md5.orig ../${sect_ver}.md5&#xA;</xsl:text>
 
   <xsl:template match="screen">
     <xsl:if test="child::* = userinput and not(@role = 'nodump')">
-      <xsl:if test="@role = 'root' and $sudo = 'y'">
-        <xsl:text>sudo sh -c '</xsl:text>
-      </xsl:if>
-      <xsl:apply-templates select="userinput"/>
-      <xsl:if test="@role = 'root' and $sudo = 'y'">
-        <xsl:text>'</xsl:text>
-      </xsl:if>
+      <xsl:choose>
+        <xsl:when test="@role = 'root'">
+          <xsl:if test="$sudo = 'y'">
+            <xsl:text>sudo sh -c '</xsl:text>
+          </xsl:if>
+          <xsl:apply-templates select="userinput" mode="root"/>
+          <xsl:if test="$sudo = 'y'">
+            <xsl:text>'</xsl:text>
+          </xsl:if>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="userinput"/>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:text>&#xA;</xsl:text>
     </xsl:if>
   </xsl:template>
@@ -436,6 +443,21 @@ popd</xsl:text>
     <xsl:apply-templates/>
   </xsl:template>
 
+  <xsl:template match="userinput" mode="root">
+    <xsl:for-each select="child::node()">
+      <xsl:choose>
+        <xsl:when test="self::text() and contains(string(),'make')">
+          <xsl:value-of select="substring-before(string(),'make')"/>
+          <xsl:text>make -j1</xsl:text>
+          <xsl:value-of select="substring-after(string(),'make')"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="self::node()"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+  </xsl:template>
+
   <xsl:template match="replaceable">
 <!-- Not needed anymore
     <xsl:choose>