From 9ef92bb74cc70d72975776762c1918044c4de1a4 Mon Sep 17 00:00:00 2001 From: Gerard Beekmans Date: Sun, 26 May 2002 20:32:12 +0000 Subject: removed gzip command explanation git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1910 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 8 ++++++++ chapter05/findutils-inst.xml | 4 ++-- chapter05/gawk-inst.xml | 6 +----- chapter05/gzip-exp.xml | 16 ---------------- chapter05/gzip.xml | 1 - entities/gzip.ent | 1 - 6 files changed, 11 insertions(+), 25 deletions(-) delete mode 100644 chapter05/gzip-exp.xml diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 4ccb81523..c27fe45f9 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -27,6 +27,14 @@ +May 26th, 2002 [gerard]: Chapter 05 - Gawk & Findutils: +simplified the installation by removing the libexecdir modifications. We +can live with a +$LFS/static/libexecdir being created. +The whole $LFS/static directory is +temporarily anyways, so we're not all that concerned with what it looks +like. + May 26th, 2002 [gerard]: Chapter 06 - Creating Directories: removed the cd / command and changed the two chmod commands to use absolute paths diff --git a/chapter05/findutils-inst.xml b/chapter05/findutils-inst.xml index 15a48c0a7..ada4e7e72 100644 --- a/chapter05/findutils-inst.xml +++ b/chapter05/findutils-inst.xml @@ -9,7 +9,7 @@ commands. patch -Np1 -i ../findutils-4.1.patch && ./configure --prefix=$LFS/static && -make libexecdir=$LFS/static/bin LDFLAGS=-static && -make libexecdir=$LFS/static/bin install +make LDFLAGS=-static && +make install diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml index 7b0862fd5..ff3dedb8f 100644 --- a/chapter05/gawk-inst.xml +++ b/chapter05/gawk-inst.xml @@ -13,11 +13,7 @@ class="directory">/usr/bin it'll run rm -rf Install Gawk by running the following commands: -cp awklib/Makefile.in awklib/Makefile.in.backup && -sed -e '/^datadir/s/awk/gawk/' \ --e '/^libexecdir/s%/awk%%' awklib/Makefile.in.backup \ -    > awklib/Makefile.in && -CPPFLAGS=-Dre_max_failures=re_max_failures2 \ +CPPFLAGS=-Dre_max_failures=re_max_failures2 \ ./configure --prefix=$LFS/static --disable-nls \     --libexecdir=$LFS/static/bin && make LDFLAGS=-static && diff --git a/chapter05/gzip-exp.xml b/chapter05/gzip-exp.xml deleted file mode 100644 index 8ab485d00..000000000 --- a/chapter05/gzip-exp.xml +++ /dev/null @@ -1,16 +0,0 @@ - -Command explanations - -cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin -&& rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip: The reason -we don't simply use mv to move the files to the new location -is because gunzip is a hardlink to gzip. On older distributions you can't -move a hardlink to another partition (and it's very possible that $LFS and -$LFS/usr are separate partitions). With more recent distributions this -isn't a problem. If you run mv to move hardlinks across partitions it'll -just do a regular cp and discard the hardlink. But, we -can't assume that every host distribution has a new enough kernel and -fileutils that works this way. - - - diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml index 0155e02e1..9ae7efa96 100644 --- a/chapter05/gzip.xml +++ b/chapter05/gzip.xml @@ -6,7 +6,6 @@ Estimated required disk space: &gzip-compsize-static; &c5-gzip-inst; -&c5-gzip-exp; &aa-gzip-desc; &aa-gzip-dep; diff --git a/entities/gzip.ent b/entities/gzip.ent index 5855087ce..d16863380 100644 --- a/entities/gzip.ent +++ b/entities/gzip.ent @@ -2,7 +2,6 @@ - -- cgit v1.2.3-54-g00ecf