Fix e2fsprogs tests to run properly in the LFS chroot envirnment.

Remove unnecessary mkdir in groff.


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

4 files changed, 32 insertions, 17 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 875600b24..2387d388a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,19 @@
     </listitem>
 -->
     <listitem>
+      <para>2014-02-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Fix e2fsprogs tests to run properly
+          in the LFS chroot envirnment.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Remove unnecessary mkdir in groff.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-02-02</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index bf4332ba9..6fc766ee3 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -44,6 +44,11 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
+    <para>First fix a problem with running regression tests in the LFS chroot
+    environment:</para>
+
+<screen><userinput remap="pre">sed -i -e 's|^LD_LIBRARY_PATH.*|&amp;:/tools/lib|' tests/test_config</userinput></screen>
+
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>
 
@@ -52,16 +57,15 @@ cd build</userinput></screen>
 
     <para>Prepare E2fsprogs for compilation:</para>
 
-<screen><userinput remap="configure">export PKG_CONFIG_PATH=/tools/lib/pkgconfig 
-
-LIBS=-L/tools/lib                  \
-CFLAGS=-I/tools/include            \
-../configure --prefix=/usr         \
-             --with-root-prefix="" \
-             --enable-elf-shlibs   \
-             --disable-libblkid    \
-             --disable-libuuid     \
-             --disable-uuidd       \
+<screen><userinput remap="configure">LIBS=-L/tools/lib                    \
+CFLAGS=-I/tools/include              \
+PKG_CONFIG_PATH=/tools/lib/pkgconfig \
+../configure --prefix=/usr           \
+             --with-root-prefix=""   \
+             --enable-elf-shlibs     \
+             --disable-libblkid      \
+             --disable-libuuid       \
+             --disable-uuidd         \
              --disable-fsck</userinput></screen>
 
     <variablelist>
@@ -131,10 +135,9 @@ CFLAGS=-I/tools/include            \
 
 <screen><userinput remap="install">make install</userinput></screen>
 
-    <para>Install the static libraries and headers and do some clean up:</para>
+    <para>Install the static libraries:</para>
 
-<screen><userinput remap="install">make install-libs
-unset PKG_CONFIG_PATH</userinput></screen>
+<screen><userinput remap="install">make install-libs</userinput></screen>
 
     <para>Make the installed static libraries writable so debugging symbols can
     be removed later:</para>
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index 7aaef076b..69a51a36c 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -61,8 +61,7 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">mkdir -pv /usr/share/doc/groff-1.22/pdf
-make install</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
 
     <para>Some documentation programs, such as <command>xman</command>,
     will not work properly without the following symlinks:</para>
diff --git a/general.ent b/general.ent
index 88a5d7fd5..27355554b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version         "SVN-20140202">
-<!ENTITY releasedate     "February 2, 2014">
+<!ENTITY version         "SVN-20140205">
+<!ENTITY releasedate     "February 5, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.5">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->