diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 840d32639..638eccdf7 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -8,44 +8,48 @@
Upgraded to:
-automake-1.7.4
+automake-1.7.6
bash-2.05b
-e2fsprogs-1.33
-file-4.02
+binutils-2.14
+e2fsprogs-1.34
+file-4.03
findutils-4.1.7
-gawk-3.1.2
+gawk-3.1.3
gcc-3.2.3
+gettext-0.12.1
glibc-2.3.2
grep-2.5.1
groff-1.19
gzip-1.3.5
less-381
libtool-1.5
+linux-2.4.21
man-1.5l
man-1.5l-80cols.patch
man-1.5l-manpath.patch
man-1.5l-pager.patch
-man-pages-1.56
+man-pages-1.58
modutils-2.4.25
-procps-3.1.8
-procps-3.1.8.patch
+procps-3.1.11
+procps-3.1.11.patch
+psmisc-21.3
sed-4.0.7
sysvinit-2.85
tar-1.13.25
-texinfo-4.5
-util-linux-2.11z
+texinfo-4.6
+util-linux-2.12
+vim-6.2
Added:
bash-2.05b.patch
-binutils-2.13.2-libc.patch
coreutils-5.0
coreutils-5.0-uname.patch
dejagnu-1.4.3
-expect-5.38
-expect-5.38.patch
+expect-5.38.4
+expect-5.38.4.patch
gawk-3.1.2.patch
gcc-2.95.3
gcc-2.95.3-2.patch
@@ -53,7 +57,7 @@
gcc-3.2.3-no_fixincludes.patch
gcc-3.2.3-specs-4.patch
inetutils-1.4.2
-lfs-utils-0.2.2
+lfs-utils-0.3
ncurses-5.3-etip.patch
perl-5.8.0-libc.patch
tcl-8.4.2
@@ -78,6 +82,22 @@
+July 30th, 2003 [gerard]: Chapter 06 - Vim: Changed the way
+the global vimrc and gvimrc
+locations are defined.
+
+July 30th, 2003 [gerard]: Chapter 05 - Binutils Pass2:
+removed the lib patch, it's no longer needed with the binutils-2.14
+upgrade.
+
+July 30th, 2003 [gerard]: Chapter 05 Binutils Pass1: Added
+make configure-host.
+
+July 30th, 2003 [gerard]: Upgraded to binutils-2.14,
+linux-2.4.21, expect-5.38.4, gawk-3.1.3, texinfo-4.6, util-linux-2.12,
+man-pages-1.58, lfs-utils-0.3, vim-6.2, gettext-0.12.1, automake-1.7.6,
+file-4.03, e2fsprogs-1.34, procps-3.1.11, psmisc-21.3
+
June 3rd, 2003 [gerard]: Chapter 06 - Gawk: removed the
removal of /bin/awk. This symlink isn't created
anymore.
diff --git a/chapter04/binutils.xml b/chapter04/binutils.xml
index 714569a22..ed8926d11 100644
--- a/chapter04/binutils.xml
+++ b/chapter04/binutils.xml
@@ -1,5 +1,3 @@
Binutils (&binutils-version;) - &binutils-size;:
-Binutils Patch (&binutils-patch-version;) - &binutils-patch-size;
-
diff --git a/chapter05/binutils-pass1-inst.xml b/chapter05/binutils-pass1-inst.xml
index 2adbdf700..cbf393942 100644
--- a/chapter05/binutils-pass1-inst.xml
+++ b/chapter05/binutils-pass1-inst.xml
@@ -38,7 +38,8 @@ when linking statically.
Continue with compiling the package:
-make LDFLAGS="-all-static"
+make configure-host
+make LDFLAGS="-all-static"
The meaning of the make option is:
diff --git a/chapter05/binutils-pass2-inst.xml b/chapter05/binutils-pass2-inst.xml
index 87ca80ec6..62529a13d 100644
--- a/chapter05/binutils-pass2-inst.xml
+++ b/chapter05/binutils-pass2-inst.xml
@@ -3,8 +3,7 @@
Installation of Binutils
-patch -Np1 -i ../binutils-&binutils-version;-lib-path.patch
-mkdir ../binutils-build
+mkdir ../binutils-build
cd ../binutils-build
../binutils-&binutils-version;/configure --prefix=/stage1 \
--enable-shared --with-lib-path=/stage1/lib
diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml
index 86c849913..4650d31b8 100644
--- a/chapter06/vim-inst.xml
+++ b/chapter06/vim-inst.xml
@@ -3,24 +3,20 @@
Installation of Vim
+Change the default locations of the vimrc and
+gvimrc files to /etc.
+
+echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
+echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h
+
Prepare Vim to be compiled:
./configure --prefix=/usr
Continue with compiling the package:
-make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\"
-
-The meaning of the make option is:
-
-
-CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\":
-This option causes vim to look for the /etc/vimrc file
-which contains vim's global settings. Normally, this file is assumed to be
-located in /usr/share/vim, but we
-feel that /etc is a more logical
-place for this kind of file.
-
+make
Finish installing the package:
diff --git a/entities/procps.ent b/entities/procps.ent
index 27dfc7d94..06c0af3b3 100644
--- a/entities/procps.ent
+++ b/entities/procps.ent
@@ -14,7 +14,7 @@
-
+