Changeset c6c6c35 for BOOK/final-system

Timestamp:

Dec 29, 2007, 12:54:17 PM (17 years ago)

Author:

Ken Moffat <zarniwhoop@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

e6d3df9

Parents:

6d0a423

Message:

Fix how we run. and clean up after, the testsuite for module-init-tools.

Location:

BOOK/final-system

Files:

• common/module-init-tools.xml (modified) (3 diffs)
• multilib/module-init-tools.xml (modified) (2 diffs)

BOOK/final-system/common/module-init-tools.xml

@@ -27 +27 @@
 
     <para os="c">Issue the following commands to perform the tests
-    (note that the <command>make distclean</command> command is required
-    to clean up the source tree, as the source gets recompiled as part
-    of the testing process):</para>
+    (note that the <command>make clean</command> and <command>rm</command>
+    commands are required to clean up the source tree, otherwise the code
+    built for testing will be installed, and the test version of
+    <command>modprobe</command> does not function outside the test
+    environment).</para>
 
 <screen os="d"><userinput>./configure &amp;&amp;
-make check &amp;&amp;
-make distclean</userinput></screen>
+make DOCBOOKTOMAN=true check &amp;&amp;
+make clean &amp;&amp;
+rm *.5 *.8</userinput></screen>
 
     <para os="e">Prepare Module-Init-Tools for compilation:</para>
@@ -56 +59 @@
 <screen os="i"><userinput>make DOCBOOKTOMAN=true</userinput></screen>
 
+    <variablelist os="i2">
+      <title>The meaning of the make parameter:</title>
+      <varlistentry>
+        <term><parameter>DOCBOOKTOMAN=true</parameter></term>
+        <listitem>
+          <para>The <literal>DOCBOOKTOMAN</literal> variable specifies the
+          program which is executed to convert the sgml source to man pages.
+          We do not have either of the alternatives, so we create empty pages
+          instead.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
     <para os="j">Install the package:</para>
 
@@ -61 +77 @@
 
     <variablelist os="l">
-      <title>The meaning of the make parameter:</title>
+      <title>The meaning of the make install parameter:</title>
       <varlistentry>
         <term><parameter>INSTALL=install</parameter></term>

BOOK/final-system/multilib/module-init-tools.xml

@@ -28 +28 @@
 <screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure &amp;&amp;
 make check &amp;&amp;
-make distclean</userinput></screen>
+make clean &amp;&amp;
+rm *.5 *.8</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -51 +52 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='i2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='j'])"/>