diff --git a/appendixa/man-down.xml b/appendixa/man-down.xml index 091d0b142..47916e03a 100644 --- a/appendixa/man-down.xml +++ b/appendixa/man-down.xml @@ -2,5 +2,9 @@ Official Download Location Man (&man-version;): - + + +Man Patch (&man-patch-version;): + + diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 32a4f72d0..1b9fa7e59 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,9 +40,11 @@ fileutils-4.1.patch gawk-3.1.1-2.patch gcc-3.2.patch +gcc-3.2-nofixincludes.patch glibc-2.2.5-2.patch gzip-1.2.4b.patch kbd-1.06-3.patch +man-1.5k.patch ncurses-5.2.patch procps-2.0.7.patch sh-utils-2.0-hostname.patch @@ -59,6 +61,14 @@ +September 28th, 2002 [gerard]: Chapter 05 - GCC: Added the +nofixincludes patch to prevent that script from running in Chapter +05. It should run in Chapter 06, so we need it to be a seperate +patch. + +September 28th, 2002 [gerard]: Chapter 06 - Man: Replaced +the sed contruction with a regular patch. + September 28th, 2002 [gerard]: Chapter 06 - Bzip2: Removed the PREFIX=/usr from the make install command because the diff --git a/chapter04/gcc-patch.xml b/chapter04/gcc-patch.xml index f93b6248e..b1b7d2779 100644 --- a/chapter04/gcc-patch.xml +++ b/chapter04/gcc-patch.xml @@ -1,3 +1,7 @@ GCC Patch (&gcc-patch-version;) - &gcc-patch-size;: + +GCC nofixincludes Patch: + + diff --git a/chapter04/packages.xml b/chapter04/packages.xml index 341c5209b..702492849 100644 --- a/chapter04/packages.xml +++ b/chapter04/packages.xml @@ -45,6 +45,7 @@ &c3-make; &c3-makedev; &c3-man; +&c3-man-patch; &c3-manpages; &c3-modutils; &c3-ncurses; diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml index 6a95c53f3..c64f22f6c 100644 --- a/chapter05/gcc-exp.xml +++ b/chapter05/gcc-exp.xml @@ -6,6 +6,9 @@ This patch fixes a few bugs. In particular it contains the "copy fix" and "var fix" documented at . +patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch: +This patch prevents the fixincludes script from running. + --prefix=/static: This is NOT a typo. GCC hard codes some paths while compiling and so we need to pass /static as the prefix during ./configure. We pass the real install prefix during the diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index 63565f160..36662b95d 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -15,6 +15,7 @@ been warned. Install GCC by running the following commands: patch -Np1 -i ../gcc-&gcc-patch-version;.patch && +patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch && mkdir ../gcc-build && cd ../gcc-build && ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \ diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml index fc09310b2..b5e88a17a 100644 --- a/chapter06/man-exp.xml +++ b/chapter06/man-exp.xml @@ -8,10 +8,12 @@ where a program is found. By appending /usr/bin:/bin to PATH for the ./configure command, we make sure that man doesn't use the /static versions of our programs. -sed '/^PAGER/s/-is/-isR/': -The version of groff we installed supports SGR (Set Graphics Rendition) -escape sequences. In order for our man pages to display properly, we -add the R argument to the call for the less pager. +patch -Np1 -i ../man-&man-patch-version;.patch: +This patch comments out one of the files in the man.conf +file (MANPATH /usr/man) because it will create redundant results when using +programs like whatis. It also adds the +-R option to the PAGER variable so +man pages are displayed properly. diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index 350228636..ad73cabdb 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -3,13 +3,10 @@ Run the following commands to install man: -PATH=$PATH:/usr/bin:/bin \ +patch -Np1 -i ../man-&man-patch-version;.patch && +PATH=$PATH:/usr/bin:/bin \     ./configure -default -confdir=/etc && make && -cp src/man.conf{,.backup} && -sed -e '/^PAGER/s/-is/-isR/' \ -    -e 's%MANPATH[[:space:]]/usr/man%#MANPATH /usr/man%' \ -    src/man.conf.backup > src/man.conf && make install Note: If you wish to disable SGR escape sequences, you should diff --git a/entities/man.ent b/entities/man.ent index 9173794bc..7ffe254ac 100644 --- a/entities/man.ent +++ b/entities/man.ent @@ -1,4 +1,5 @@ + @@ -13,6 +14,8 @@ + + diff --git a/index.xml b/index.xml index fe2537a94..57b3d2f7b 100644 --- a/index.xml +++ b/index.xml @@ -15,7 +15,7 @@ - +