diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 53393c996..d1d801e89 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
+
+ 2009-03-11
+
+
+ [matthew] - Upgraded to Bash-4.0. Fixes
+ #2351.
+
+
+
+
2009-02-17
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 254c4c9fd..ed1c85029 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -209,7 +209,7 @@
Added:
- &bash-fixes-patch;
+ &automake-test-patch;
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 28d925a1b..e48a909a6 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -41,15 +41,6 @@
-
- Bash Documentation (&bash-doc-version;) - &bash-doc-size;:
-
- Home page:
- Download:
- MD5 sum: &bash-doc-md5;
-
-
-
Berkeley DB (&db-version;) - &db-size;:
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 6883f27a8..a6eb472a9 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -18,6 +18,14 @@
+
+ Automake Test Fix Patch - &automake-test-patch-size;:
+
+ Download:
+ MD5 sum: &automake-test-patch-md5;
+
+
+
Berkeley DB Upstream Fixes Patch - &db-fixes-patch-size;:
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 26fe314ee..10dd9988d 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -45,8 +45,7 @@
Prepare Bash for compilation:
-./configure --prefix=/tools --without-bash-malloc \
- ac_cv_func_working_mktime=yes
+./configure --prefix=/tools --without-bash-malloc
The meaning of the configure options:
@@ -61,14 +60,6 @@
more stable.
-
- ac_cv_func_working_mktime=yes
-
- This parameter bypasses the search for mktime in configure
- and uses the version in glibc. The is necessary due to a change in
- gcc that has not been incorporated into this package yet.
-
-
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 @@
Installation of Automake
+ Fix a bug in the testsuite that can lead to a spurious failure:
+
+patch -Np1 -i ../&automake-test-patch;
+
Prepare Automake for compilation:
./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 281ce99ca..98d966c06 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -40,22 +40,22 @@
Installation of Bash
- If you downloaded the Bash documentation tarball and wish to install
- HTML documentation, issue the following commands:
-
-tar -xvf ../bash-doc-&bash-doc-version;.tar.gz
-sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
- Makefile.in
-
Prepare Bash for compilation:
./configure --prefix=/usr --bindir=/bin \
- --without-bash-malloc \
- --with-installed-readline ac_cv_func_working_mktime=yes
+ --htmldir=/usr/share/doc/bash-&bash-version; --without-bash-malloc \
+ --with-installed-readline
The meaning of the configure options:
+
+ --htmldir
+
+ This option designates the directory into which HTML formatted
+ documentation will be installed.
+
+
--with-installed-readline
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 @@
+
+
-
-
diff --git a/general.ent b/general.ent
index c35c12cf9..291092005 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/packages.ent b/packages.ent
index 77285a5f9..9f720bdde 100644
--- a/packages.ent
+++ b/packages.ent
@@ -23,20 +23,15 @@
-
-
+
+
-
+
-
-
-
-
-
diff --git a/patches.ent b/patches.ent
index 3c8cefa3e..22f4f0166 100644
--- a/patches.ent
+++ b/patches.ent
@@ -1,9 +1,10 @@
-
-
-
+
+
+
+