diff options
| author | Matthew Burgess <matthew@linuxfromscratch.org> | 2009-03-11 21:27:25 +0000 |
|---|---|---|
| committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2009-03-11 21:27:25 +0000 |
| commit | 835b56ae9c714560cbf2158ef6005f9919fecc25 (patch) | |
| tree | 85c11f47564d646d5357264a213308f7d91ee316 /chapter06 | |
| parent | 01da931a7f0bc541070a6c9a21d2b6a3108e90b4 (diff) | |
Upgrade to Bash-4.0. Fixes #2351.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8821 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
| -rw-r--r-- | chapter06/automake.xml | 4 | ||||
| -rw-r--r-- | chapter06/bash.xml | 18 | ||||
| -rw-r--r-- | chapter06/chapter06.xml | 4 |
3 files changed, 15 insertions, 11 deletions
diff --git a/chapter06/automake.xml b/chapter06/automake.xml index 4d50b9637..8147bc6c6 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -41,6 +41,10 @@ <sect2 role="installation"> <title>Installation of Automake</title> + <para>Fix a bug in the testsuite that can lead to a spurious failure:</para> + +<screen><userinput remap="pre">patch -Np1 -i ../&automake-test-patch;</userinput></screen> + <para>Prepare Automake for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index 281ce99ca..98d966c06 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -40,23 +40,23 @@ <sect2 role="installation"> <title>Installation of Bash</title> - <para>If you downloaded the Bash documentation tarball and wish to install - HTML documentation, issue the following commands:</para> - -<screen><userinput remap="pre">tar -xvf ../bash-doc-&bash-doc-version;.tar.gz -sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \ - Makefile.in</userinput></screen> - <para>Prepare Bash for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin \ - --without-bash-malloc \ - --with-installed-readline ac_cv_func_working_mktime=yes</userinput></screen> + --htmldir=/usr/share/doc/bash-&bash-version; --without-bash-malloc \ + --with-installed-readline</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> <varlistentry> + <term><parameter>--htmldir</parameter></term> + <listitem> + <para>This option designates the directory into which HTML formatted + documentation will be installed.</para> + </listitem> + </varlistentry> + <varlistentry> <term><parameter>--with-installed-readline</parameter></term> <listitem> <para>This option tells Bash to use the <filename diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index c02a73728..2815a7242 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -36,12 +36,12 @@ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procps.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grep.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="readline.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bash.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libtool.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="readline.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="autoconf.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="automake.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bash.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bzip2.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="diffutils.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="file.xml"/> |