diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6ee8e13b4..b271bb1f5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,10 @@
2013-10-14
+
+ [matthew] - Update to Make 4.0. Fixes
+ #3410.
+
[matthew] - Update to Tar 1.27. Fixes
#3409.
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index dba96b8c8..ac7de5585 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -136,9 +136,9 @@
M4 &m4-version;
-
+
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 401fa8776..69abd9853 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -58,14 +58,6 @@
-
- Make Upstream Fixes Patch - &make-fixes-patch-size;:
-
- Download:
- MD5 sum: &make-fixes-patch-md5;
-
-
-
Perl Libc Patch - &perl-libc-patch-size;:
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 3eaf21932..9ae8be8cd 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -56,6 +56,10 @@ fi
sed -i -e 's/static __m128i/inline &/' sysdeps/x86_64/multiarch/strstr.c
+ Allow Glibc to be built using Make-&make-version;:
+
+sed -r -i 's/(3..89..)/\1 | 4.*/' configure
+
The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:
diff --git a/chapter05/make.xml b/chapter05/make.xml
index 44cbac46c..22b5afb4e 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -44,7 +44,20 @@
Prepare Make for compilation:
-./configure --prefix=/tools
+./configure --prefix=/tools --without-guile
+
+
+ The meaning of the configure option:
+
+
+ --without-guile
+
+ This ensures that Make-&make-version; won't link against Guile libraries, which
+ may be present on the host system, but won't be available within the
+ chroot environment in the next chapter.
+
+
+
Compile the package:
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 45102933e..e5f4503ef 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -65,6 +65,9 @@
sed -i -e 's/static __m128i/inline &/' sysdeps/x86_64/multiarch/strstr.c
+ Allow Glibc to be built with Make-&make-version;:
+
+sed -r -i 's/(3..89..)/\1 | 4.*/' configure
The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 2faaa177a..791908683 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -40,10 +40,6 @@
Installation of Make
- First apply some upstream patches:
-
-patch -Np1 -i ../&make-fixes-patch;
-
Prepare Make for compilation:
./configure --prefix=/usr
diff --git a/packages.ent b/packages.ent
index 44f1ef148..164a22db5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -367,10 +367,10 @@
-
-
+
+
-
+
diff --git a/patches.ent b/patches.ent
index e6003f7e8..4d9245105 100644
--- a/patches.ent
+++ b/patches.ent
@@ -22,10 +22,6 @@
-
-
-
-