Adjust zlib instructions to ensure .pc file and all libraries are in the proper

location.  Thanks to Chris Staub.



git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9239 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter01/changelog.xml

@@ -36,6 +36,18 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2010-04-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Adjust zlib instructions to ensure .pc
+          file and all libraries are in the proper location.
+          Thanks to Chris Staub.
+          Fixes <ulink url="&lfs-ticket-root;2630">#2630</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2010-03-27</para>
       <itemizedlist>

chapter06/zlib.xml

@@ -41,9 +41,9 @@
   <sect2 role="installation">
     <title>Installation of Zlib</title>
 
-    <para>Prepare Zlib for building the dynamic library:</para>
+    <para>Prepare Zlib for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --libdir=/lib</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -53,16 +53,16 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>Install the shared library:</para>
+    <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
 
-    <para>The previous command installed a <filename
-    class="extension">.so</filename> file in <filename
-    class="directory">/lib</filename>. We will remove it and relink it into
-    <filename class="directory">/usr/lib</filename>:</para>
+    <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">rm -v /lib/libz.so
+<screen><userinput remap="install">mv -v /usr/lib/libz.so* /lib
 ln -sfv ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen>
 
   </sect2>

general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20100327">
-<!ENTITY releasedate "March 27, 2010">
+<!ENTITY version "SVN-20100412">
+<!ENTITY releasedate "April 12, 2010">
 <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.7">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->