From e397c3ada5bbef0281414709fa1952a2ce07c44d Mon Sep 17 00:00:00 2001 From: Gerard Beekmans Date: Wed, 15 Jan 2003 02:58:53 +0000 Subject: converted sh-utils git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2322 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendixa/sed-dep.xml | 2 ++ appendixa/sed-desc.xml | 9 ++++----- appendixa/sed.xml | 1 + appendixa/shellutils-dep.xml | 2 ++ appendixa/shellutils-desc.xml | 13 ++++--------- appendixa/shellutils.xml | 1 + chapter05/sed-inst.xml | 16 ++++++++++++---- chapter05/sed.xml | 4 ++-- chapter05/shellutils-inst.xml | 14 ++++++++++---- chapter05/shellutils.xml | 4 ++-- entities/sed.ent | 1 + entities/shellutils.ent | 1 + 12 files changed, 42 insertions(+), 26 deletions(-) diff --git a/appendixa/sed-dep.xml b/appendixa/sed-dep.xml index 9edc82fce..d5868302a 100644 --- a/appendixa/sed-dep.xml +++ b/appendixa/sed-dep.xml @@ -1,3 +1,5 @@ +   + Sed Installation Dependencies diff --git a/appendixa/sed-desc.xml b/appendixa/sed-desc.xml index a77c4661c..06391989e 100644 --- a/appendixa/sed-desc.xml +++ b/appendixa/sed-desc.xml @@ -1,11 +1,10 @@ -Contents of Sed +   -Last checked against version &sed-contversion;. +Descriptions -Program Files -sed +Last checked against version &sed-contversion;. -Descriptions +Program file descriptions sed sed is a stream editor. A stream editor is used to perform basic text diff --git a/appendixa/sed.xml b/appendixa/sed.xml index 11b2c784a..a46af37a7 100644 --- a/appendixa/sed.xml +++ b/appendixa/sed.xml @@ -3,6 +3,7 @@ &aa-sed-down; +&aa-sed-shortdesc; &aa-sed-desc; &aa-sed-dep; diff --git a/appendixa/shellutils-dep.xml b/appendixa/shellutils-dep.xml index 01ab6f206..3bcd7248e 100644 --- a/appendixa/shellutils-dep.xml +++ b/appendixa/shellutils-dep.xml @@ -1,3 +1,5 @@ +   + Sh-utils Installation Dependencies diff --git a/appendixa/shellutils-desc.xml b/appendixa/shellutils-desc.xml index 02cd024a1..f8a9ae50e 100644 --- a/appendixa/shellutils-desc.xml +++ b/appendixa/shellutils-desc.xml @@ -1,15 +1,10 @@ -Contents of Sh-utils +   -Last checked against version &sh-utils-contversion;. +Descriptions -Program Files -basename, chroot, date, dirname, -echo, env, expr, factor, false, groups, hostid, id, logname, -nice, nohup, pathchk, pinky, printenv, printf, pwd, seq, sleep, stty, -su, tee, test, true, tty, uname, uptime, users, who, whoami and -yes +Last checked against version &sh-utils-contversion;. -Descriptions +Program file descriptions basename basename strips directory and suffixes from filenames. diff --git a/appendixa/shellutils.xml b/appendixa/shellutils.xml index 04931e20c..e058ee405 100644 --- a/appendixa/shellutils.xml +++ b/appendixa/shellutils.xml @@ -3,6 +3,7 @@ &aa-shellutils-down; +&aa-shellutils-shortdesc; &aa-shellutils-desc; &aa-shellutils-dep; 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 @@ +   + Installation of Sed -Install Sed by running the following commands: +Prepare Sed to be compiled: CPPFLAGS=-Dre_max_failures=re_max_failures2 \ -    LDFLAGS="-static" ./configure --prefix=$LFS/static --disable-nls && -make && -make install +    LDFLAGS="-static" ./configure --prefix=$LFS/static --disable-nls + +Continue with installing the package: + +make + +And finish off installing the package: + +make install 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 @@ Estimated build time: &sed-time-static; Estimated required disk space: &sed-compsize-static; -&c5-sed-inst; -&aa-sed-desc; +&aa-sed-shortdesc; &aa-sed-dep; +&c5-sed-inst; 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. patch -Np1 -i ../sh-utils-&sh-utils-version;.patch -Install Sh-utils by running the following commands: +Prepare Sh-utils to be compiled: LDFLAGS="-static" ./configure --prefix=$LFS/static \ -    --disable-nls && -make && -make install +    --disable-nls + +Continue with compiling the package: + +make + +And finish off installing the package: + +make install During the make install stage you will see the following warning: 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 @@ Estimated build time: &sh-utils-time-static; Estimated required disk space: &sh-utils-compsize-static; -&c5-shellutils-inst; -&aa-shellutils-desc; +&aa-shellutils-shortdesc; &aa-shellutils-dep; +&c5-shellutils-inst; diff --git a/entities/sed.ent b/entities/sed.ent index 3f80e59d6..56c122779 100644 --- a/entities/sed.ent +++ b/entities/sed.ent @@ -7,6 +7,7 @@ + diff --git a/entities/shellutils.ent b/entities/shellutils.ent index 01d2c2dd0..89a80082e 100644 --- a/entities/shellutils.ent +++ b/entities/shellutils.ent @@ -10,6 +10,7 @@ + -- cgit v1.2.3-54-g00ecf