diff options
Diffstat (limited to 'chapter06')
| -rw-r--r-- | chapter06/man-exp.xml | 2 | ||||
| -rw-r--r-- | chapter06/man-inst.xml | 7 | ||||
| -rw-r--r-- | chapter06/shadowpwd-inst.xml | 5 | ||||
| -rw-r--r-- | chapter06/sysvinit-inst.xml | 6 |
4 files changed, 12 insertions, 8 deletions
diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml index 02f3f092a..b7ab46db4 100644 --- a/chapter06/man-exp.xml +++ b/chapter06/man-exp.xml @@ -1,7 +1,7 @@ <sect2> <title>Command explanations</title> -<para><userinput>patch -Np1 -i ../man-1.5i2.patch:</userinput> This patch +<para><userinput>for ... sed ... done:</userinput> This construct changes man so that it uses awk instead of gawk which is the default. We use this as LFS uses awk instead of gawk.</para> diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index c2eba71e2..963a083ca 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -1,9 +1,12 @@ <sect2> <title>Installation of Man</title> -<para>Before Man is installed, the man patch file needs to be unpacked.</para> +<para>Run the following commands to install man:</para> -<para><screen><userinput>patch -Np1 -i ../man-&man-version;.patch &&</userinput> +<para><screen><userinput>for i in configure src/Makefile.in src/makewhatis.sh</userinput> +<userinput>do sed s/gawk/awk/g $i > $i.fixed</userinput> +<userinput>mv $i.fixed $i</userinput> +<userinput>done</userinput> <userinput>./configure -default &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput></screen></para> diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index a0921ba07..edcddfad4 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/chapter06/shadowpwd-inst.xml @@ -4,8 +4,9 @@ <para>Install the Shadow Password Suite by running the following commands:</para> -<para><screen><userinput>mv src/useradd.c useradd.c.temp &&</userinput> -<userinput>sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' useradd.c.temp > src/useradd.c &&</userinput> + +<para><screen><userinput>sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' src/useradd.c > useradd.c.temp &&</userinput> +<userinput>mv useradd.c.temp src/useradd.c &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml index a772e7ad3..d534cc4f4 100644 --- a/chapter06/sysvinit-inst.xml +++ b/chapter06/sysvinit-inst.xml @@ -12,9 +12,9 @@ processes started by init the TERM signal".</para> <para>Install Sysvinit by running the following commands:</para> -<para><screen><userinput>mv src/init.c init.c.temp &&</userinput> -<userinput>sed 's/\(.*\)\(Sending processes\)\(.*\) \</userinput> -<userinput> /\1\2 started by init\3/' init.c.temp > src/init.c &&</userinput> +<para><screen><userinput>sed 's/\(.*\)\(Sending processes\)\(.*\) \</userinput> +<userinput> /\1\2 started by init\3/' src/init.c > init.c.temp &&</userinput> +<userinput>mv init.c.temp src/init.c &&</userinput> <userinput>make -C src &&</userinput> <userinput>make -C src install</userinput></screen></para> |