Update to coreutils-8.25. Fixes

Simplify bash installation procedures. 



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

3 files changed, 8 insertions, 14 deletions

diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 73c67129a..77fc08c04 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -48,7 +48,6 @@
     <para>Prepare Bash for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr                       \
-            --bindir=/bin                       \
             --docdir=/usr/share/doc/bash-&bash-version; \
             --without-bash-malloc               \
             --with-installed-readline</userinput></screen>
@@ -84,9 +83,11 @@
 
 <screen><userinput remap="test">su nobody -s /bin/bash -c "PATH=$PATH make tests"</userinput></screen>
 
-    <para>Install the package:</para>
+    <para>Install the package and move the main executable to
+    <filename class='directory'>/bin</filename>:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make install
+mv -vf /usr/bin/bash /bin</userinput></screen>
 
     <para>Run the newly compiled <command>bash</command> program (replacing the one that is
     currently being executed):</para>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 765b916ef..264834493 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -41,7 +41,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
@@ -62,6 +61,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 2103d4ec2..3635301fb 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -48,16 +48,9 @@
 
     <para>POSIX requires that programs from Coreutils recognize character
     boundaries correctly even in multibyte locales. The following patch fixes
-    this non-compliance and other internationalization-related bugs.
-    <!--Afterwards make sure the timestamp for <filename>Makefile.in</filename> is
-    later than all other files to prevent a <command>make</command>
-    error:</para>-->
-    Afterwards disable a test that fails with the current version of perl.</para>
+    this non-compliance and other internationalization-related bugs.</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch; 
-sed -i '/tests\/misc\/sort.pl/ d' Makefile.in</userinput></screen>
-
-<!--touch Makefile.in</userinput></screen>-->
+<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch;</userinput></screen>
 
     <note>
       <para>In the past, many bugs were found in this patch. When reporting new
@@ -95,7 +88,7 @@ sed -i '/tests\/misc\/sort.pl/ d' Makefile.in</userinput></screen>
 
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">FORCE_UNSAFE_CONFIGURE=1 make</userinput></screen>
 
     <para>Skip down to <quote>Install the
     package</quote> if not running the test suite.</para>