Index: BOOK/cross-tools/common/m4.xml
===================================================================
--- BOOK/cross-tools/common/m4.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/cross-tools/common/m4.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -1,47 +1,37 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE c:package [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 ]>
 
-<sect1 id="ch-cross-tools-m4" role="wrap">
-  <?dbhtml filename="m4.html"?>
+<c:package xmlns:c="http://schema.cross-lfs.org/book"
+           xmlns:xi="http://www.w3.org/2001/XInclude"
+           id="ch-cross-tools-m4" c:multibuild="false">
 
-  <title>M4-&m4-version;</title>
+  <c:title>M4</c:title>
+  <c:version>&m4-version;</c:version>
+  <c:variant>cross-tools</c:variant>
 
-  <indexterm zone="ch-cross-tools-m4">
-    <primary sortas="a-M4">M4</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
+  <xi:include href="../../final-system/common/m4.xml"
+  xpointer="xmlns(co=http://schema.cross-lfs.org/book)
+            xpointer(/co:package/co:description[1])" />
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/m4.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
+<c:install>  
 
-  <sect2 role="installation">
-    <title>Installation of M4</title>
+    <c:para>Prepare M4 for compilation:</c:para>
 
-    <para os="a">Prepare M4 for compilation:</para>
+<c:command>./configure --prefix=/cross-tools</c:command>
 
-<screen os="b"><userinput>./configure --prefix=/cross-tools</userinput></screen>
+    <c:para>Compile the package:</c:para>
 
-    <para os="c">Compile the package:</para>
+<c:command>make</c:command>
 
-<screen os="d"><userinput>make</userinput></screen>
+    <c:para>Install the package:</c:para>
 
-    <para os="e">Install the package:</para>
+<c:command>make install</c:command>
 
-<screen os="f"><userinput>make install</userinput></screen>
+  </c:install>
 
-  </sect2>
+  <c:contents c:ref="ch-system-m4" />
 
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-m4" role="."/></para>
-
-  </sect2>
-
-</sect1>
+</c:package>
Index: BOOK/final-system/common/m4.xml
===================================================================
--- BOOK/final-system/common/m4.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/final-system/common/m4.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -1,82 +1,50 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE c:package [ 
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 ]>
 
-<sect1 id="ch-system-m4" role="wrap">
-  <?dbhtml filename="m4.html"?>
+<c:package xmlns:c="http://schema.cross-lfs.org/book"
+           id="ch-system-m4" c:multibuild="false">
 
-  <title>M4-&m4-version;</title>
+  <c:title>M4</c:title>
+  <c:version>&m4-version;</c:version>  
+  <c:description>The M4 package contains a macro processor.</c:description>
 
-  <indexterm zone="ch-system-m4">
-    <primary sortas="a-M4">M4</primary>
-  </indexterm>
+  <c:install>
 
-  <sect2 role="package">
-    <title/>
+    <c:para>Prepare M4 for compilation:</c:para>
 
-    <para>The M4 package contains a macro processor.</para>
+    <c:command c:multilib="false">./configure --prefix=/usr</c:command>
+    <c:command c:multilib="true">CC="gcc ${BUILD64}" ./configure --prefix=/usr</c:command>
 
-  </sect2>
+    <c:para>Compile the package:</c:para>
 
-  <sect2 role="installation">
-    <title>Installation of M4</title>
+    <c:command>make</c:command>
 
-    <para os="a">Prepare M4 for compilation:</para>
+    <c:para>To test the results, issue:
+    <c:command>make check</c:command>.</c:para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+    <c:para>Install the package:</c:para>
 
-    <para os="c">Compile the package:</para>
+    <c:command>make install</c:command>
 
-<screen os="d"><userinput>make</userinput></screen>
+  </c:install>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+  <c:contents>
 
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-m4" role="content">
-    <title>Contents of M4</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>m4</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="m4">
-         <!-- Don't remove the extra space, it prevet a FOP warning. -->
-        <term><command>m4 </command></term>
-        <listitem>
-          <para>copies the given files while expanding the macros that they
+    <c:program>
+      <c:name>m4</c:name>
+          <c:description>copies the given files while expanding the macros that they
           contain. These macros are either built-in or user-defined and can
           take any number of arguments. Besides performing macro expansion,
-          <command>m4</command> has built-in functions for including named
+          <c:command>m4</c:command> has built-in functions for including named
           files, running Unix commands, performing integer arithmetic,
-          manipulating text, recursion, etc. The <command>m4</command>
+          manipulating text, recursion, etc. The <c:command>m4</c:command>
           program can be used either as a front-end to a compiler or as a
-          macro processor in its own right.</para>
-          <indexterm zone="ch-system-m4 m4">
-            <primary sortas="b-m4">m4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
+          macro processor in its own right.</c:description>
+    </c:program>
 
-    </variablelist>
+  </c:contents>
 
-  </sect2>
-
-</sect1>
+</c:package>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/final-system/mips64-chapter.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -58,5 +58,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-n32.xml"/>
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/final-system/ppc64-chapter.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -48,5 +48,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/final-system/sparc64-chapter.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -48,5 +48,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/final-system/x86_64-chapter.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -48,5 +48,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
Index: BOOK/temp-system/common/m4.xml
===================================================================
--- BOOK/temp-system/common/m4.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/temp-system/common/m4.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -1,30 +1,26 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE c:package [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 ]>
 
-<sect1 id="ch-temp-system-m4" role="wrap">
-  <?dbhtml filename="m4.html"?>
+<c:package xmlns:c="http://schema.cross-lfs.org/book"
+           xmlns:xi="http://www.w3.org/2001/XInclude"
+           id="ch-temp-system-m4" c:multibuild="false">
 
-  <title>M4-&m4-version;</title>
+  <c:title>M4</c:title>
+  <c:version>&m4-version;</c:version>
+  <c:variant>temporary system</c:variant>
 
-  <indexterm zone="ch-temp-system-m4">
-    <primary sortas="a-M4">M4</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
+  <xi:include href="../../final-system/common/m4.xml"
+  xpointer="xmlns(co=http://schema.cross-lfs.org/book)
+            xpointer(/co:package/co:description[1])" />
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/m4.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
+  <c:install>
 
-  <sect2 role="installation">
-    <title>Installation of M4</title>
+    <c:para>Configure can not properly determine the results of the
+    following tests:</c:para>
 
-    <para os="cc1">Configure can not properly determine the results of the
-    following tests:</para>
-
-<screen os="cc2"><userinput>cat &gt; config.cache &lt;&lt; EOF
+    <c:command>cat &gt; config.cache &lt;&lt; EOF
 gl_cv_func_btowc_eof=yes
 gl_cv_func_mbrtowc_incomplete_state=yes
@@ -35,29 +31,27 @@
 gl_cv_func_wcrtomb_retval=yes
 gl_cv_func_wctob_works=yes
-EOF</userinput></screen>
+EOF</c:command>
 
-    <para os="a">Prepare M4 for compilation:</para>
+    <c:para>Prepare M4 for compilation:</c:para>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
+    <c:command c:multilib="false">./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
+    --cache-file=config.cache</c:command>
 
-    <para os="c">Compile the package:</para>
+    <c:command c:multilib="true">CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --cache-file=config.cache</c:command>
 
-<screen os="d"><userinput>make</userinput></screen>
+    <c:para>Compile the package:</c:para>
 
-    <para os="e">Install the package:</para>
+    <c:command>make</c:command>
 
-<screen os="f"><userinput>make install</userinput></screen>
+    <c:para>Install the package:</c:para>
 
-  </sect2>
+    <c:command>make install</c:command>
 
-  <sect2 role="content">
-    <title/>
+  </c:install>
 
-    <para>Details on this package are located in <xref
-    linkend="contents-m4" role="."/></para>
+  <c:contents c:ref="ch-system-m4" />
 
-  </sect2>
-
-</sect1>
+</c:package>
Index: BOOK/temp-system/mips64-64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-64-chapter.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/temp-system/mips64-64-chapter.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -35,5 +35,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
Index: BOOK/temp-system/mips64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-chapter.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/temp-system/mips64-chapter.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -35,5 +35,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
Index: BOOK/temp-system/ppc64-chapter.xml
===================================================================
--- BOOK/temp-system/ppc64-chapter.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/temp-system/ppc64-chapter.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -34,5 +34,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
Index: BOOK/temp-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-64-chapter.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/temp-system/sparc64-64-chapter.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -35,5 +35,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
Index: BOOK/temp-system/sparc64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-chapter.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/temp-system/sparc64-chapter.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -35,5 +35,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
Index: BOOK/temp-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-64-chapter.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/temp-system/x86_64-64-chapter.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -35,5 +35,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
Index: BOOK/temp-system/x86_64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-chapter.xml	(revision d240b159b20ed2458a7f818d2c95fe66c3589926)
+++ BOOK/temp-system/x86_64-chapter.xml	(revision 1c9985f2223af9ebba0756a5aa526072e8660041)
@@ -35,5 +35,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
