aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2003-01-15 02:58:53 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2003-01-15 02:58:53 +0000
commite397c3ada5bbef0281414709fa1952a2ce07c44d (patch)
tree8a9d69c28ed5ade4a2b3ef1abca9b681b9694e7d /chapter05
parentfe2fdae3c68e2f1ee3d78226882e3aa819d876f3 (diff)
converted sh-utils
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2322 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/sed-inst.xml16
-rw-r--r--chapter05/sed.xml4
-rw-r--r--chapter05/shellutils-inst.xml14
-rw-r--r--chapter05/shellutils.xml4
4 files changed, 26 insertions, 12 deletions
diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml
index f2bdf1b86..f0e2dc7a5 100644
--- a/chapter05/sed-inst.xml
+++ b/chapter05/sed-inst.xml
@@ -1,12 +1,20 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Installation of Sed</title>
-<para>Install Sed by running the following commands:</para>
+<para>Prepare Sed to be compiled:</para>
<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-&nbsp;&nbsp;&nbsp;&nbsp;LDFLAGS="-static" ./configure --prefix=$LFS/static --disable-nls &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;LDFLAGS="-static" ./configure --prefix=$LFS/static --disable-nls</userinput></screen></para>
+
+<para>Continue with installing the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
</sect2>
diff --git a/chapter05/sed.xml b/chapter05/sed.xml
index 67f74ea86..2f0ceaee5 100644
--- a/chapter05/sed.xml
+++ b/chapter05/sed.xml
@@ -5,9 +5,9 @@
<screen>Estimated build time: &sed-time-static;
Estimated required disk space: &sed-compsize-static;</screen>
-&c5-sed-inst;
-&aa-sed-desc;
+&aa-sed-shortdesc;
&aa-sed-dep;
+&c5-sed-inst;
</sect1>
diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml
index b9b2659e5..c0384a4d1 100644
--- a/chapter05/shellutils-inst.xml
+++ b/chapter05/shellutils-inst.xml
@@ -10,12 +10,18 @@ it.</para>
<para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch</userinput></screen></para>
-<para>Install Sh-utils by running the following commands:</para>
+<para>Prepare Sh-utils to be compiled:</para>
<para><screen><userinput>LDFLAGS="-static" ./configure --prefix=$LFS/static \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
<para>During the make install stage you will see the following warning:</para>
diff --git a/chapter05/shellutils.xml b/chapter05/shellutils.xml
index cf8814310..cd11c4ebf 100644
--- a/chapter05/shellutils.xml
+++ b/chapter05/shellutils.xml
@@ -5,9 +5,9 @@
<screen>Estimated build time: &sh-utils-time-static;
Estimated required disk space: &sh-utils-compsize-static;</screen>
-&c5-shellutils-inst;
-&aa-shellutils-desc;
+&aa-shellutils-shortdesc;
&aa-shellutils-dep;
+&c5-shellutils-inst;
</sect1>