Changeset 73ace20 for BOOK/final-system/multilib/kmod-n32.xml

Timestamp:

Oct 10, 2012, 6:42:21 PM (12 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

f7b2c72

Parents:

0cce40d (diff), 80cbd64 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of git.cross-lfs.org:cross-lfs

File:

• BOOK/final-system/multilib/kmod-n32.xml (moved) (moved from BOOK/final-system/multilib/glib-n32.xml) (2 diffs)

BOOK/final-system/multilib/kmod-n32.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-glib-n32" role="wrap">
-  <?dbhtml filename="glib-n32.html"?>
+<sect1 id="ch-system-kmod-n32" role="wrap">
+  <?dbhtml filename="kmod-n32.html"?>
 
-  <title>Glib-&glib-version; N32 Libraries</title>
+  <title>Kmod-&kmod-version; N32 Libraries</title>
 
-  <indexterm zone="ch-system-glib-n32">
-    <primary sortas="a-Glib">Glib</primary>
+  <indexterm zone="ch-system-kmod-n32">
+    <primary sortas="a-Kmod">Kmod</primary>
     <secondary>N32</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glib.xml"
+  href="../common/kmod.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of Glib</title>
+    <title>Installation of Kmod N32 Libraries</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glib.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32 \
-    --sysconfdir=/etc</userinput></screen>
+    <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
+            ./configure --prefix=/usr \
+            --bindir=/bin --sysconfdir=/etc \
+            --with-rootlibdir=/lib32 --libdir=/usr/lib32 \
+            --with-zlib --with-xz</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glib.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glib.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glib.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glib.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glib.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+    
   </sect2>
 
@@ -56 +63 @@
 
     <para>Details on this package are located in <xref
-    linkend="contents-glib" role="."/></para>
+    linkend="contents-kmod" role="."/></para>
 
   </sect2>