diff options
| -rw-r--r-- | chapter01/changelog.xml | 12 | ||||
| -rw-r--r-- | chapter06/zlib.xml | 16 | ||||
| -rw-r--r-- | general.ent | 4 |
3 files changed, 22 insertions, 10 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 7ea794da4..4ec3dde31 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,18 @@ --> <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> <listitem> diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml index 45edfe1ca..044ceadf5 100644 --- a/chapter06/zlib.xml +++ b/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> diff --git a/general.ent b/general.ent index a1c5c73d9..519fe7d1b 100644 --- a/general.ent +++ b/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 – --> <!ENTITY milestone "6.7"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> |