Changeset 1c9985f for BOOK/temp-system/common

Timestamp:

Dec 18, 2013, 12:35:49 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

026bb5d

Parents:

d240b159

Message:

Updated m4 to use simplified xml, for real

File:

• BOOK/temp-system/common/m4.xml (modified) (2 diffs)

BOOK/temp-system/common/m4.xml

@@ -1 +1 @@
 <?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 +31 @@
 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>