Changeset 5e06d04 for chapter06

Timestamp:

02/01/2021 08:37:19 AM (3 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib-10.1

Children:

f695e02

Parents:

3e73c5d

Message:

Merge changes from trunk to multilib

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@12107 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• chapter06.xml (modified) (1 diff)
• zlib.xml (modified) (3 diffs)

chapter06/chapter06.xml

@@ -23 +23 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
-<!-- xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/ -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>

chapter06/zlib.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-tools-zlib" role="wrap" arch="ml_32,ml_x32,ml_all">
+<sect1 id="ch-tools-zlib" role="wrap">
   <?dbhtml filename="zlib.html"?>
 
@@ -50 +50 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results, issue:</para>
-
-<screen><userinput remap="test">make check</userinput></screen>
-
     <para>Install the package:</para>
 
-    <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
-
-    <para>The shared library needs to be moved to
-    <filename class="directory">/lib</filename>, and as a result the
-    <filename class="extension">.so</filename> file in
-    <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
-
-<screen><userinput remap="install">mv -v $LFS/usr/lib/libz.so.* $LFS/lib
+<screen><userinput remap="install">make DESTDIR=$LFS install
+mv -v $LFS/usr/lib/libz.so.* $LFS/lib
 ln -sfv ../../lib/$(readlink $LFS/usr/lib/libz.so) $LFS/usr/lib/libz.so</userinput></screen>
 
@@ -125 +115 @@
 
   <sect2 role="content">
-    <title/>
-      <para>Details on this package are located in <xref linkend="contents-zlib" role="."/></para>
+     <title/>
+     <para>Details on this package are located in <xref linkend="contents-zlib" role="."/></para>
+
   </sect2>