cvs commit: LFS/BOOK/chapter06 bash-inst.xml bzip2-inst.xml changingowner.xml chroot.xml chrootcmd.xml config-glibc.xml config-keyboard.xml e2fsprogs-inst.xml ed-inst.xml fileutils-inst.xml gawk-inst.xml gcc-inst.xml glibc-inst.xml groff-inst.xml gzip-inst.xml ncurses-exp.xml ncurses-inst.xml netkitbase-inst.xml procps-inst.xml psmisc-inst.xml shadowpwd-inst.xml shellutils-inst.xml sysvinit-inst.xml tar-inst.xml textutils-inst.xml utillinux-inst.xml vim-inst.xml

gerard at linuxfromscratch.org gerard at linuxfromscratch.org
Thu May 2 13:15:03 PDT 2002


gerard      02/05/02 13:15:02

  Modified:    BOOK/chapter01 changelog.xml
               BOOK/chapter05 bash-exp.xml bash-inst.xml bzip2-inst.xml
                        creatingdirs.xml fileutils-exp.xml
                        fileutils-inst.xml gawk-inst.xml gcc-inst.xml
                        grep-inst.xml shellutils-inst.xml tar-inst.xml
                        texinfo-inst.xml textutils-inst.xml
               BOOK/chapter06 bash-inst.xml bzip2-inst.xml
                        changingowner.xml chroot.xml chrootcmd.xml
                        config-glibc.xml config-keyboard.xml
                        e2fsprogs-inst.xml ed-inst.xml fileutils-inst.xml
                        gawk-inst.xml gcc-inst.xml glibc-inst.xml
                        groff-inst.xml gzip-inst.xml ncurses-exp.xml
                        ncurses-inst.xml netkitbase-inst.xml
                        procps-inst.xml psmisc-inst.xml shadowpwd-inst.xml
                        shellutils-inst.xml sysvinit-inst.xml tar-inst.xml
                        textutils-inst.xml utillinux-inst.xml vim-inst.xml
  Log:
  fix bugs #335 and #342 plus various touch ups, layout fixed (line wrapping mostly)
  
  Revision  Changes    Path
  1.276     +11 -0     LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.275
  retrieving revision 1.276
  diff -u -r1.275 -r1.276
  --- changelog.xml	2 May 2002 18:50:00 -0000	1.275
  +++ changelog.xml	2 May 2002 20:15:00 -0000	1.276
  @@ -27,6 +27,17 @@
   
   </para></listitem>
   
  +<listitem><para>May 2nd, 2002 [gerard]: Chapter 06 - Procps: Changed the
  +two single quotes to two double quotes (the two single quotes can be
  +mistaken for one double quote which will cause an error).</para></listitem>
  +
  +<listitem><para>May 2nd, 2002 [gerard]: Changed the
  +<userinput>cd dir && ln -sf</userinput> commands to one single command
  +(such as <userinput>ln -sf bash $LFS/bin/sh</userinput> Same goes for
  +<userinput>cd dir && mv/cp</userinput> constructions which are now replaced
  +with constructions like
  +<userinput>mv $LFS/usr/bin/{bzcat,bzip2} $LFS/bin</userinput></para></listitem>
  +
   <listitem><para>May 2nd, 2002 [markh]: Removed the "Removing old NSS
   library files" section.</para></listitem>
   
  
  
  
  1.14      +5 -5      LFS/BOOK/chapter05/bash-exp.xml
  
  Index: bash-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/bash-exp.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- bash-exp.xml	17 Apr 2002 12:24:53 -0000	1.13
  +++ bash-exp.xml	2 May 2002 20:15:00 -0000	1.14
  @@ -28,11 +28,11 @@
   That package requires ncurses and termcap can't reliably be used
   there.</para>
   
  -<para><userinput>ln -sf bash sh:</userinput> This command creates the sh
  -symlink that points to bash. Most scripts run themselves via 'sh'
  -(invoked by the #!/bin/sh as the first line in the scripts) which
  -invokes a special bash mode. Bash will then behave (as closely as
  -possible) as the original Bourne shell.</para>
  +<para><userinput>ln -sf bash $LFS/bin/sh:</userinput> This command creates
  +the <filename class="symlink">sh</filename> symlink that points to bash. Most
  +scripts run themselves via 'sh' (invoked by the #!/bin/sh as the first line
  +in the scripts) which invokes a special bash mode. Bash will then behave
  +(as closely as possible) as the original Bourne shell.</para>
   
   <para>The <userinput>&&</userinput>'s at the end of every line cause 
   the next command to be executed only if the previous command exists 
  
  
  
  1.26      +4 -6      LFS/BOOK/chapter05/bash-inst.xml
  
  Index: bash-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/bash-inst.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- bash-inst.xml	2 Feb 2002 18:04:56 -0000	1.25
  +++ bash-inst.xml	2 May 2002 20:15:00 -0000	1.26
  @@ -15,18 +15,16 @@
   create <filename>libcurses.a</filename> as a symlink by running the 
   following commands as user root:</para>
   
  -<para><screen><userinput>cd /usr/lib &&
  -ln -s libncurses.a libcurses.a</userinput></screen></para>
  +<para><screen><userinput>ln -s libncurses.a /usr/lib/libcurses.a</userinput></screen></para>
   
   <para>Now we can continue. Install Bash by running the following 
   commands:</para>
   
  -<para><screen><userinput>./configure --enable-static-link --prefix=$LFS/usr \
  -   --bindir=$LFS/bin --with-curses &&
  +<para><screen><userinput>./configure --enable-static-link \
  +    --prefix=$LFS/usr --bindir=$LFS/bin --with-curses &&
   make &&
   make install &&
  -cd $LFS/bin &&
  -ln -sf bash sh</userinput></screen></para>
  +ln -sf bash $LFS/bin/sh</userinput></screen></para>
   
   <para>If the make install phase ends with something along the lines of</para>
   
  
  
  
  1.16      +1 -2      LFS/BOOK/chapter05/bzip2-inst.xml
  
  Index: bzip2-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/bzip2-inst.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- bzip2-inst.xml	9 Mar 2002 02:52:58 -0000	1.15
  +++ bzip2-inst.xml	2 May 2002 20:15:00 -0000	1.16
  @@ -5,8 +5,7 @@
   
   <para><screen><userinput>make CC="gcc -static" &&
   make PREFIX=$LFS/usr install &&
  -cd $LFS/usr/bin &&
  -mv bzcat bunzip2 bzip2 bzip2recover bzless bzmore $LFS/bin</userinput></screen></para>
  +mv $LFS/usr/bin/{bzcat,bunzip2,bzip2,bzip2recover,bzless,bzmore} $LFS/bin</userinput></screen></para>
   
   <para>Although it's not strictly a part of a basic LFS system it's worth
   mentioning that a patch for Tar can be downloaded which enables the tar
  
  
  
  1.6       +11 -11    LFS/BOOK/chapter05/creatingdirs.xml
  
  Index: creatingdirs.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/creatingdirs.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- creatingdirs.xml	12 Apr 2002 13:27:45 -0000	1.5
  +++ creatingdirs.xml	2 May 2002 20:15:00 -0000	1.6
  @@ -10,17 +10,17 @@
   <para><screen><userinput>cd $LFS &&
   mkdir -p bin boot dev/pts etc/opt home lib mnt proc root sbin tmp var opt &&
   for dirname in $LFS/usr $LFS/usr/local
  -   do
  -   mkdir $dirname
  -   cd $dirname
  -   mkdir bin etc include lib sbin share src
  -   ln -s share/man
  -   ln -s share/doc
  -   ln -s share/info
  -   cd $dirname/share
  -   mkdir dict doc info locale man nls misc terminfo zoneinfo
  -   cd $dirname/share/man
  -   mkdir man{1,2,3,4,5,6,7,8}
  +    do
  +    mkdir $dirname
  +    cd $dirname
  +    mkdir bin etc include lib sbin share src
  +    ln -s share/man
  +    ln -s share/doc
  +    ln -s share/info
  +    cd $dirname/share
  +    mkdir dict doc info locale man nls misc terminfo zoneinfo
  +    cd $dirname/share/man
  +    mkdir man{1,2,3,4,5,6,7,8}
   done &&
   cd $LFS/var &&
   mkdir -p lock log mail run spool tmp opt cache lib/misc local &&
  
  
  
  1.13      +2 -2      LFS/BOOK/chapter05/fileutils-exp.xml
  
  Index: fileutils-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/fileutils-exp.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- fileutils-exp.xml	31 Jan 2002 23:35:02 -0000	1.12
  +++ fileutils-exp.xml	2 May 2002 20:15:00 -0000	1.13
  @@ -7,8 +7,8 @@
   
   <para><userinput>cp lib/Makefile.in lib/Makefile.in.backup &&
   sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \
  -   -e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \
  -   lib/Makefile.in.backup > lib/Makefile.in:</userinput>
  +    -e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \
  +    lib/Makefile.in.backup > lib/Makefile.in:</userinput>
   This is used to fix a problem with building fileutils statically on glibc 2.2.3 
   systems.  If this isn't done, then there is the possibility of all of the 
   fileutils programs causing segmentation faults once chroot is entered 
  
  
  
  1.34      +4 -5      LFS/BOOK/chapter05/fileutils-inst.xml
  
  Index: fileutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/fileutils-inst.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- fileutils-inst.xml	19 Apr 2002 18:27:01 -0000	1.33
  +++ fileutils-inst.xml	2 May 2002 20:15:00 -0000	1.34
  @@ -23,17 +23,16 @@
   
   <para><screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup &&
   sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \
  -   -e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \
  -   lib/Makefile.in.backup > lib/Makefile.in</userinput></screen></para>
  +    -e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \
  +    lib/Makefile.in.backup > lib/Makefile.in</userinput></screen></para>
   
   <para>Install Fileutils by running the following commands:</para>
   
   <para><screen><userinput>./configure --disable-nls \
  -   --prefix=$LFS/usr --bindir=$LFS/bin &&
  +    --prefix=$LFS/usr --bindir=$LFS/bin &&
   make LDFLAGS=-static &&
   make install &&
  -cd $LFS/usr/bin &&
  -ln -sf ../../bin/install</userinput></screen></para>
  +ln -sf ../../bin/install $LFS/usr/bin</userinput></screen></para>
   
   <para>Once you have installed Fileutils, you can test whether the
   segmentation fault problem has been avoided by running
  
  
  
  1.9       +2 -2      LFS/BOOK/chapter05/gawk-inst.xml
  
  Index: gawk-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/gawk-inst.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- gawk-inst.xml	1 May 2002 19:10:45 -0000	1.8
  +++ gawk-inst.xml	2 May 2002 20:15:01 -0000	1.9
  @@ -16,10 +16,10 @@
   <para><screen><userinput>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 &&
  +    > awklib/Makefile.in &&
   CPPFLAGS=-Dre_max_failures=re_max_failures2 \
   ./configure --prefix=$LFS/usr --disable-nls \
  -   --libexecdir=$LFS/usr/bin &&
  +    --libexecdir=$LFS/usr/bin &&
   make LDFLAGS=-static &&
   make install</userinput></screen></para>
   
  
  
  
  1.26      +3 -6      LFS/BOOK/chapter05/gcc-inst.xml
  
  Index: gcc-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/gcc-inst.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- gcc-inst.xml	1 May 2002 17:21:09 -0000	1.25
  +++ gcc-inst.xml	2 May 2002 20:15:01 -0000	1.26
  @@ -21,12 +21,9 @@
      --disable-nls --disable-shared --enable-threads=posix &&
   make BOOT_LDFLAGS=-static bootstrap &&
   make prefix=$LFS/usr install &&
  -cd $LFS/lib &&
  -ln -sf ../usr/bin/cpp &&
  -cd $LFS/usr/lib &&
  -ln -sf ../bin/cpp &&
  -cd $LFS/usr/bin &&
  -ln -sf gcc cc &&
  +ln -sf ../usr/bin/cpp $LFS/lib &&
  +ln -sf ../bin/cpp $LFS/usr/lib &&
  +ln -sf gcc $LFS/usr/bin/cc &&
   rmdir $LFS/usr/*-gnu/include &&
   rmdir $LFS/usr/*-gnu</userinput></screen></para>
   
  
  
  
  1.11      +1 -1      LFS/BOOK/chapter05/grep-inst.xml
  
  Index: grep-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/grep-inst.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- grep-inst.xml	1 May 2002 19:10:45 -0000	1.10
  +++ grep-inst.xml	2 May 2002 20:15:01 -0000	1.11
  @@ -5,7 +5,7 @@
   
   <para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
   ./configure --prefix=$LFS/usr --bindir=$LFS/bin \
  -   --disable-nls --disable-perl-regexp &&
  +    --disable-nls --disable-perl-regexp &&
   make LDFLAGS=-static &&
   make install</userinput></screen></para>
   
  
  
  
  1.23      +5 -5      LFS/BOOK/chapter05/shellutils-inst.xml
  
  Index: shellutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/shellutils-inst.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- shellutils-inst.xml	1 May 2002 19:10:45 -0000	1.22
  +++ shellutils-inst.xml	2 May 2002 20:15:01 -0000	1.23
  @@ -3,13 +3,13 @@
   
   <para>Install Sh-utils by running the following commands:</para>
   
  -<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &&
  +<para><screen><userinput>./configure --prefix=$LFS/usr \
  +    --disable-nls &&
   make LDFLAGS=-static &&
   make install &&
  -cd $LFS/usr/bin &&
  -mv basename date echo false hostname $LFS/bin &&
  -mv pwd sleep stty test true uname $LFS/bin &&
  -mv chroot ../sbin</userinput></screen></para>
  +mv $LFS/usr/bin/{basename,date,echo,false,hostname} $LFS/bin &&
  +mv $LFS/usr/bin/{pwd,sleep,stty,test,true,uname} $LFS/bin &&
  +mv $LFS/usr/bin/chroot $LFS/usr/sbin</userinput></screen></para>
   
   <para>During the make install stage you will see the following warning:</para>
   
  
  
  
  1.11      +3 -2      LFS/BOOK/chapter05/tar-inst.xml
  
  Index: tar-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/tar-inst.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- tar-inst.xml	27 Oct 2001 22:21:44 -0000	1.10
  +++ tar-inst.xml	2 May 2002 20:15:01 -0000	1.11
  @@ -12,8 +12,9 @@
   
   <para>Install Tar by running the following commands:</para>
   
  -<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls \
  -   --libexecdir=$LFS/usr/bin --bindir=$LFS/bin && 
  +<para><screen><userinput>./configure --prefix=$LFS/usr \
  +    --disable-nls --libexecdir=$LFS/usr/bin \
  +    --bindir=$LFS/bin && 
   make LDFLAGS=-static &&
   make install</userinput></screen></para>
   
  
  
  
  1.9       +2 -1      LFS/BOOK/chapter05/texinfo-inst.xml
  
  Index: texinfo-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/texinfo-inst.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- texinfo-inst.xml	27 Oct 2001 22:21:44 -0000	1.8
  +++ texinfo-inst.xml	2 May 2002 20:15:01 -0000	1.9
  @@ -3,7 +3,8 @@
   
   <para>Install Texinfo by running the following commands:</para>
   
  -<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &&
  +<para><screen><userinput>./configure --prefix=$LFS/usr \
  +    --disable-nls &&
   make LDFLAGS=-static &&
   make install</userinput></screen></para>
   
  
  
  
  1.9       +3 -2      LFS/BOOK/chapter05/textutils-inst.xml
  
  Index: textutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/textutils-inst.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- textutils-inst.xml	10 Feb 2002 15:36:19 -0000	1.8
  +++ textutils-inst.xml	2 May 2002 20:15:01 -0000	1.9
  @@ -3,10 +3,11 @@
   
   <para>Install Textutils by running the following commands:</para>
   
  -<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &&
  +<para><screen><userinput>./configure --prefix=$LFS/usr \
  +    --disable-nls &&
   make LDFLAGS=-static &&
   make install &&
  -mv $LFS/usr/bin/cat $LFS/usr/bin/head $LFS/bin</userinput></screen></para>
  +mv $LFS/usr/bin/{cat,head} $LFS/bin</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.19      +2 -3      LFS/BOOK/chapter06/bash-inst.xml
  
  Index: bash-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/bash-inst.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- bash-inst.xml	10 Dec 2001 16:40:26 -0000	1.18
  +++ bash-inst.xml	2 May 2002 20:15:02 -0000	1.19
  @@ -4,11 +4,10 @@
   <para>Install Bash by running the following commands:</para>
   
   <para><screen><userinput>./configure --prefix=/usr --with-curses \
  -   --bindir=/bin &&
  +    --bindir=/bin &&
   make &&
   make install &&
  -cd /bin &&
  -ln -sf bash sh &&
  +ln -sf bash /bin/sh &&
   exec /bin/bash --login</userinput></screen></para>
   
   </sect2>
  
  
  
  1.22      +6 -9      LFS/BOOK/chapter06/bzip2-inst.xml
  
  Index: bzip2-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/bzip2-inst.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- bzip2-inst.xml	3 Apr 2002 21:37:41 -0000	1.21
  +++ bzip2-inst.xml	2 May 2002 20:15:02 -0000	1.22
  @@ -10,15 +10,12 @@
   cp bzip2-shared /bin/bzip2 &&
   ln -s libbz2.so.1.0 libbz2.so &&
   cp -a libbz2.so* /lib &&
  -cd /usr/lib &&
  -ln -sf ../../lib/libbz2.so &&
  -cd /usr/bin &&
  -rm bunzip2 bzcat bzip2 &&
  -rm /bin/bzless /bin/bzmore &&
  -mv bzip2recover bzless bzmore /bin &&
  -cd /bin &&
  -ln -sf bzip2 bunzip2 &&
  -ln -sf bzip2 bzcat</userinput></screen></para>
  +ln -sf ../../lib/libbz2.so $LFS/usr/lib&&
  +rm /usr/bin/{bunzip2,bzcat,bzip2} &&
  +rm /bin/{bzless,bzmore} &&
  +mv /usr/bin/{bzip2recover,bzless,bzmore} /bin &&
  +ln -sf bzip2 /bin/bunzip2 &&
  +ln -sf bzip2 /bin/bzcat</userinput></screen></para>
   
   
   <para>Although it's not strictly a part of a basic LFS system it's worth
  
  
  
  1.4       +3 -4      LFS/BOOK/chapter06/changingowner.xml
  
  Index: changingowner.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/changingowner.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- changingowner.xml	2 Feb 2002 20:47:25 -0000	1.3
  +++ changingowner.xml	2 May 2002 20:15:02 -0000	1.4
  @@ -6,14 +6,13 @@
   all files and directories that were installed in chapter 5 back to root.
   Run the following commands to do so:</para>
   
  -<para><screen><userinput>cd / &&
  -chown 0.0 . proc &&
  -chown -R 0.0 bin boot dev etc home lib mnt opt root sbin tmp usr var</userinput></screen></para>
  +<para><screen><userinput>chown 0.0 / /proc &&
  +chown -R 0.0 /{bin,boot,dev,etc,home,lib,mnt,opt,root,sbin,tmp,usr,var}</userinput></screen></para>
   
   <para>Depending on the filesystem you created on the LFS partition, you may
   have a /lost+found directory. If so, run:</para>
   
  -<para><screen><userinput>chown 0.0 lost+found</userinput></screen></para>
  +<para><screen><userinput>chown 0.0 /lost+found</userinput></screen></para>
   
   <para>These commands will change the ownership of the root partition and
   the <filename>/proc</filename> directory to root, plus everything under
  
  
  
  1.20      +0 -7      LFS/BOOK/chapter06/chroot.xml
  
  Index: chroot.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/chroot.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- chroot.xml	16 Mar 2002 23:28:17 -0000	1.19
  +++ chroot.xml	2 May 2002 20:15:02 -0000	1.20
  @@ -19,13 +19,6 @@
   like vim and less to operate properly. If you need other variables
   present, such as CFLAGS or CXXFLAGS, you need to set them again.</para>
   
  -<para>The reason we do <userinput>cd $LFS</userinput> before running the
  -<userinput>chroot</userinput> command is that older sh-utils packages 
  -have a chroot program which doesn't do the cd by itself, therefore
  -meaning that we have to perform it manually.  While this isn't an issue 
  -with most modern distributions, it does no harm anyways and ensures that 
  -the command works for everyone.</para>
  -
   <para>Now that we are inside a chroot'ed environment, we can continue to
   install all the basic system software. You have to make sure all the
   following commands in this and following chapters are run from within the 
  
  
  
  1.6       +2 -3      LFS/BOOK/chapter06/chrootcmd.xml
  
  Index: chrootcmd.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/chrootcmd.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- chrootcmd.xml	27 Oct 2001 22:21:44 -0000	1.5
  +++ chrootcmd.xml	2 May 2002 20:15:02 -0000	1.6
  @@ -1,3 +1,2 @@
  -<userinput>cd $LFS &&
  -chroot $LFS /usr/bin/env -i HOME=/root \
  -   TERM=$TERM /bin/bash --login</userinput>
  +<userinput>chroot $LFS /usr/bin/env -i HOME=/root \
  +    TERM=$TERM /bin/bash --login</userinput>
  
  
  
  1.12      +3 -4      LFS/BOOK/chapter06/config-glibc.xml
  
  Index: config-glibc.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/config-glibc.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- config-glibc.xml	7 Nov 2001 15:42:16 -0000	1.11
  +++ config-glibc.xml	2 May 2002 20:15:02 -0000	1.12
  @@ -38,19 +38,18 @@
   <para> Create the <filename class="directory">/etc/localtime</filename> symlink
   by running:</para>
   
  -<para><screen><userinput>cd /etc &&
  -ln -sf ../usr/share/zoneinfo/<tzselect's output> localtime</userinput></screen></para>
  +<para><screen><userinput>ln -sf ../usr/share/zoneinfo/<tzselect's output> /etc/localtime</userinput></screen></para>
   
   <para>tzselect's output can be something like <emphasis>EST5EDT</emphasis> or
   <emphasis>Canada/Eastern</emphasis>.</para>
   
   <para>The symlink you'd create with that information would be:</para>
   
  -<para><screen><userinput>ln -sf ../usr/share/zoneinfo/EST5EDT localtime</userinput></screen></para>
  +<para><screen><userinput>ln -sf ../usr/share/zoneinfo/EST5EDT /etc/localtime</userinput></screen></para>
   
   <para>Or:</para>
   
  -<para><screen><userinput>ln -sf ../usr/share/zoneinfo/Canada/Eastern localtime </userinput></screen></para>
  +<para><screen><userinput>ln -sf ../usr/share/zoneinfo/Canada/Eastern /etc/localtime </userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.4       +3 -4      LFS/BOOK/chapter06/config-keyboard.xml
  
  Index: config-keyboard.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/config-keyboard.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- config-keyboard.xml	5 Apr 2002 20:26:49 -0000	1.3
  +++ config-keyboard.xml	2 May 2002 20:15:02 -0000	1.4
  @@ -8,13 +8,12 @@
   <filename class="symlink">/usr/share/kbd/keymaps/defkeymap.map.gz</filename>
   symlink by running the following commands:</para>
   
  -<para><screen><userinput>cd /usr/share/kbd/keymaps &&
  -ln -s <path/to/keymap> defkeymap.map.gz</userinput></screen></para>
  +<para><screen><userinput>ln -s <path/to/keymap> /usr/share/kbd/keymaps/defkeymap.map.gz</userinput></screen></para>
   
   <para>Replace <path/to/keymap> with the your keyboard's map file. For
   example, if you have a Dutch keyboard, you would run:</para>
   
  -<para><screen><userinput>ln -s i386/qwerty/nl.map.gz defkeymap.map.gz</userinput></screen></para>
  +<para><screen><userinput>ln -s i386/qwerty/nl.map.gz /usr/share/kbd/keymaps/defkeymap.map.gz</userinput></screen></para>
   
   <para>An second option to configure your keyboard's layout is to compile
   the keymap directly into the kernel. This will make sure that your
  @@ -30,7 +29,7 @@
   <para>Run the following commands to accomplish that:</para>
   
   <para><screen><userinput>loadkeys -m /usr/share/kbd/keymaps/defkeymap.map.gz > \
  -   /usr/src/linux/drivers/char/defkeymap.c</userinput></screen></para>
  +    /usr/src/linux/drivers/char/defkeymap.c</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.17      +1 -1      LFS/BOOK/chapter06/e2fsprogs-inst.xml
  
  Index: e2fsprogs-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/e2fsprogs-inst.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- e2fsprogs-inst.xml	3 Apr 2002 23:07:46 -0000	1.16
  +++ e2fsprogs-inst.xml	2 May 2002 20:15:02 -0000	1.17
  @@ -6,7 +6,7 @@
   <para><screen><userinput>mkdir ../e2fsprogs-build &&
   cd ../e2fsprogs-build &&
   ../e2fsprogs-&e2fsprogs-version;/configure --prefix=/usr --with-root-prefix="" \
  -   --enable-elf-shlibs &&
  +    --enable-elf-shlibs &&
   make &&
   make install &&
   make install-libs &&
  
  
  
  1.14      +3 -3      LFS/BOOK/chapter06/ed-inst.xml
  
  Index: ed-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/ed-inst.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ed-inst.xml	16 Dec 2001 16:00:23 -0000	1.13
  +++ ed-inst.xml	2 May 2002 20:15:02 -0000	1.14
  @@ -10,9 +10,9 @@
   
   <para><screen><userinput>cp buf.c buf.c.backup &&
   sed 's/int u/int u, sfd/' buf.c.backup | \
  -   sed '/.*\*mktemp.*/d' | \
  -   sed 's/.*if (mktemp.*/  sfd = mkstemp(sfn);\
  -   if ((sfd == -1) || (sfp = fopen (sfn, "w+")) == NULL)/' > buf.c &&
  +    sed '/.*\*mktemp.*/d' | \
  +    sed 's/.*if (mktemp.*/  sfd = mkstemp(sfn);\
  +    if ((sfd == -1) || (sfp = fopen (sfn, "w+")) == NULL)/' > buf.c &&
   ./configure --prefix=/usr &&
   make &&
   make install &&
  
  
  
  1.9       +1 -2      LFS/BOOK/chapter06/fileutils-inst.xml
  
  Index: fileutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/fileutils-inst.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- fileutils-inst.xml	30 Jan 2002 16:23:29 -0000	1.8
  +++ fileutils-inst.xml	2 May 2002 20:15:02 -0000	1.9
  @@ -6,8 +6,7 @@
   <para><screen><userinput>./configure --prefix=/usr --bindir=/bin &&
   make &&
   make install &&
  -cd /usr/bin &&
  -ln -sf ../../bin/install</userinput></screen></para>
  +ln -sf ../../bin/install /usr/bin</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.6       +1 -1      LFS/BOOK/chapter06/gawk-inst.xml
  
  Index: gawk-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/gawk-inst.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- gawk-inst.xml	1 Apr 2002 14:42:18 -0000	1.5
  +++ gawk-inst.xml	2 May 2002 20:15:02 -0000	1.6
  @@ -16,7 +16,7 @@
   <para><screen><userinput>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 &&
  +    > awklib/Makefile.in &&
   ./configure --prefix=/usr --libexecdir=/usr/bin &&
   make &&
   make install</userinput></screen></para>
  
  
  
  1.27      +4 -7      LFS/BOOK/chapter06/gcc-inst.xml
  
  Index: gcc-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/gcc-inst.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- gcc-inst.xml	1 May 2002 17:21:09 -0000	1.26
  +++ gcc-inst.xml	2 May 2002 20:15:02 -0000	1.27
  @@ -26,15 +26,12 @@
   mkdir ../gcc-build &&
   cd ../gcc-build &&
   ../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
  -   --enable-languages=c,c++ --enable-threads=posix &&
  +    --enable-languages=c,c++ --enable-threads=posix &&
   make bootstrap &&
   make install &&
  -cd /lib &&
  -ln -sf ../usr/bin/cpp &&
  -cd /usr/lib &&
  -ln -sf ../bin/cpp &&
  -cd /usr/bin &&
  -ln -sf gcc cc &&
  +ln -sf ../usr/bin/cpp /lib &&
  +ln -sf ../bin/cpp /usr/lib &&
  +ln -sf gcc /usr/bin/cc &&
   rmdir /usr/*-gnu/include &&
   rmdir /usr/*-gnu</userinput></screen></para>
   
  
  
  
  1.59      +3 -2      LFS/BOOK/chapter06/glibc-inst.xml
  
  Index: glibc-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/glibc-inst.xml,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- glibc-inst.xml	25 Apr 2002 18:25:09 -0000	1.58
  +++ glibc-inst.xml	2 May 2002 20:15:02 -0000	1.59
  @@ -25,13 +25,14 @@
   <para><screen><userinput>mknod -m 0666 /dev/null c 1 3 &&
   touch /etc/ld.so.conf &&
   cp malloc/Makefile malloc/Makefile.backup &&
  -sed 's%\$(PERL)%/usr/bin/perl%' malloc/Makefile.backup > malloc/Makefile &&
  +sed 's%\$(PERL)%/usr/bin/perl%' \
  +    malloc/Makefile.backup > malloc/Makefile &&
   cp login/Makefile login/Makefile.backup &&
   sed 's/root/0/' login/Makefile.backup > login/Makefile &&
   mkdir ../glibc-build &&
   cd ../glibc-build &&
   ../glibc-&glibc-version;/configure --prefix=/usr \
  -   --enable-add-ons --libexecdir=/usr/bin &&
  +    --enable-add-ons --libexecdir=/usr/bin &&
   echo "cross-compiling = no" > configparms &&
   make &&
   make install &&
  
  
  
  1.10      +3 -4      LFS/BOOK/chapter06/groff-inst.xml
  
  Index: groff-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/groff-inst.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- groff-inst.xml	3 Apr 2002 23:35:44 -0000	1.9
  +++ groff-inst.xml	2 May 2002 20:15:02 -0000	1.10
  @@ -6,10 +6,9 @@
   <para><screen><userinput>./configure --prefix=/usr &&
   make &&
   make install &&
  -cd /usr/bin &&
  -ln -s soelim zsoelim &&
  -ln -s eqn geqn &&
  -ln -s tbl gtbl</userinput></screen></para>
  +ln -s soelim /usr/bin/zsoelim &&
  +ln -s eqn /usr/bin/geqn &&
  +ln -s tbl /usr/bin/gtbl</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.12      +5 -7      LFS/BOOK/chapter06/gzip-inst.xml
  
  Index: gzip-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/gzip-inst.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- gzip-inst.xml	10 Feb 2002 15:56:45 -0000	1.11
  +++ gzip-inst.xml	2 May 2002 20:15:02 -0000	1.12
  @@ -8,13 +8,11 @@
   sed 's%"BINDIR"%/bin%' gzexe.in.backup > gzexe.in &&
   make &&
   make install &&
  -cd /usr/bin &&
  -mv gzip /bin &&
  -rm gunzip zcat &&
  -cd /bin &&
  -ln -sf gzip gunzip &&
  -ln -sf gzip zcat &&
  -ln -sf gunzip uncompress</userinput></screen></para>
  +mv /usr/bin/gzip /bin &&
  +rm /usr/bin/{gunzip,zcat} &&
  +ln -sf gzip /bin/gunzip &&
  +ln -sf gzip /bin/zcat &&
  +ln -sf gunzip /bin/uncompress</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.16      +1 -1      LFS/BOOK/chapter06/ncurses-exp.xml
  
  Index: ncurses-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/ncurses-exp.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ncurses-exp.xml	21 Apr 2002 13:01:52 -0000	1.15
  +++ ncurses-exp.xml	2 May 2002 20:15:02 -0000	1.16
  @@ -7,7 +7,7 @@
   <para><userinput>--disable-termcap:</userinput> Disabled the compilation of
   termcap fall back support.</para>
   
  -<para><userinput>cd /lib && mv *.a /usr/lib :</userinput> This
  +<para><userinput>mv /lib/*.a /usr/lib :</userinput> This
   moves all of the static ncurses library files from /lib to /usr/lib.
   /lib should only contain the shared files which are essential to the
   system when /usr may not be mounted.</para>
  
  
  
  1.18      +9 -11     LFS/BOOK/chapter06/ncurses-inst.xml
  
  Index: ncurses-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/ncurses-inst.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ncurses-inst.xml	27 Oct 2001 22:21:44 -0000	1.17
  +++ ncurses-inst.xml	2 May 2002 20:15:02 -0000	1.18
  @@ -4,18 +4,16 @@
   <para>Install Ncurses by running the following commands:</para>
   
   <para><screen><userinput>./configure --prefix=/usr --libdir=/lib \
  -   --with-shared --disable-termcap &&
  +    --with-shared --disable-termcap &&
   make &&
   make install &&
  -cd /lib &&
  -mv *.a /usr/lib &&
  -chmod 755 *.5.2 &&
  -cd /usr/lib &&
  -ln -sf libncurses.a libcurses.a &&
  -ln -sf ../../lib/libncurses.so &&
  -ln -sf ../../lib/libcurses.so &&
  -ln -sf ../../lib/libform.so &&
  -ln -sf ../../lib/libpanel.so &&
  -ln -sf ../../lib/libmenu.so</userinput></screen></para>
  +mv /lib/*.a /usr/lib &&
  +chmod 755 /lib/*.5.2 &&
  +ln -sf libncurses.a /usr/lib/libcurses.a &&
  +ln -sf ../../lib/libncurses.so /usr/lib &&
  +ln -sf ../../lib/libcurses.so /usr/lib &&
  +ln -sf ../../lib/libform.so /usr/lib &&
  +ln -sf ../../lib/libpanel.so /usr/lib &&
  +ln -sf ../../lib/libmenu.so /usr/lib</userinput></screen></para>
   </sect2>
   
  
  
  
  1.9       +1 -2      LFS/BOOK/chapter06/netkitbase-inst.xml
  
  Index: netkitbase-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/netkitbase-inst.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- netkitbase-inst.xml	27 Oct 2001 22:21:44 -0000	1.8
  +++ netkitbase-inst.xml	2 May 2002 20:15:02 -0000	1.9
  @@ -6,8 +6,7 @@
   <para><screen><userinput>./configure &&
   make &&
   make install &&
  -cd etc.sample &&
  -cp services protocols /etc</userinput></screen></para>
  +cp etc.sample/{services,protocols} /etc</userinput></screen></para>
   
   <para>There are other files in the <filename
   class="directory">etc.sample</filename> directory which might be of
  
  
  
  1.10      +1 -1      LFS/BOOK/chapter06/procps-inst.xml
  
  Index: procps-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/procps-inst.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- procps-inst.xml	27 Oct 2001 22:21:44 -0000	1.9
  +++ procps-inst.xml	2 May 2002 20:15:02 -0000	1.10
  @@ -4,7 +4,7 @@
   <para>Install Procps by running the following commands:</para>
   
   <para><screen><userinput>make &&
  -make XSCPT='' install &&
  +make XSCPT="" install &&
   mv /usr/bin/kill /bin</userinput></screen></para>
   
   </sect2>
  
  
  
  1.9       +3 -3      LFS/BOOK/chapter06/psmisc-inst.xml
  
  Index: psmisc-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/psmisc-inst.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- psmisc-inst.xml	19 Apr 2002 18:27:01 -0000	1.8
  +++ psmisc-inst.xml	2 May 2002 20:15:02 -0000	1.9
  @@ -3,7 +3,8 @@
   
   <para>Install Psmisc by running the following commands:</para>
   
  -<para><screen><userinput>./configure --prefix=/usr --exec-prefix=/ &&
  +<para><screen><userinput>./configure --prefix=/usr \
  +    --exec-prefix=/ &&
   make &&
   make install</userinput></screen></para>
   
  @@ -23,8 +24,7 @@
   package's installation by creating the <filename>/bin/pidof</filename>
   symlink by running:</para>
   
  -<para><screen><userinput>cd /bin
  -ln -s killall pidof</userinput></screen></para>
  +<para><screen><userinput>ln -s killall /bin/pidof</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.27      +6 -9      LFS/BOOK/chapter06/shadowpwd-inst.xml
  
  Index: shadowpwd-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/shadowpwd-inst.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- shadowpwd-inst.xml	15 Mar 2002 21:38:05 -0000	1.26
  +++ shadowpwd-inst.xml	2 May 2002 20:15:02 -0000	1.27
  @@ -12,17 +12,14 @@
   <para><screen><userinput>./configure --prefix=/usr --enable-shared &&
   make &&
   make install &&
  -cd etc &&
  -cp limits login.access /etc &&
  -sed 's%/var/spool/mail%/var/mail%' login.defs.linux > /etc/login.defs &&
  -cd /usr/sbin &&
  -ln -sf vipw vigr &&
  +cp etc/{limits,login.access} /etc &&
  +sed 's%/var/spool/mail%/var/mail%' \
  +    etc/login.defs.linux > /etc/login.defs &&
  +ln -sf vipw /usr/bin/vigr &&
   rm /bin/vipw &&
   mv /bin/sg /usr/bin &&
  -cd /lib &&
  -mv libmisc.*a libshadow.*a /usr/lib &&
  -cd /usr/lib &&
  -ln -s ../../lib/libshadow.so</userinput></screen></para>
  +mv /lib/{libmisc.*a,libshadow.*a} /usr/lib &&
  +ln -s ../../lib/libshadow.so /usr/lib</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.14      +4 -6      LFS/BOOK/chapter06/shellutils-inst.xml
  
  Index: shellutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/shellutils-inst.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- shellutils-inst.xml	7 Mar 2002 18:25:47 -0000	1.13
  +++ shellutils-inst.xml	2 May 2002 20:15:02 -0000	1.14
  @@ -6,10 +6,9 @@
   <para><screen><userinput>./configure --prefix=/usr &&
   make &&
   make install &&
  -cd /usr/bin &&
  -mv basename date echo false hostname /bin &&
  -mv pwd sleep stty su test true uname /bin &&
  -mv chroot ../sbin</userinput></screen></para>
  +mv /usr/bin/{basename,date,echo,false,hostname} /bin &&
  +mv /usr/bin/{pwd,sleep,stty,su,test,true,uname} /bin &&
  +mv /usr/bin/chroot /usr/sbin</userinput></screen></para>
   
   </sect2>
   
  @@ -23,8 +22,7 @@
   <filename>[</filename> binary. We create that in this way, while still in the
   <filename class="directory">/bin</filename> directory:</para>
   
  -<para><screen><userinput>cd /bin &&
  -ln -sf test [</userinput></screen></para>
  +<para><screen><userinput>ln -sf test /bin/[</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.20      +1 -1      LFS/BOOK/chapter06/sysvinit-inst.xml
  
  Index: sysvinit-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/sysvinit-inst.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- sysvinit-inst.xml	21 Apr 2002 13:01:52 -0000	1.19
  +++ sysvinit-inst.xml	2 May 2002 20:15:02 -0000	1.20
  @@ -13,7 +13,7 @@
   
   <para><screen><userinput>cp src/init.c src/init.c.backup &&
   sed 's/\(.*\)\(Sending processes\)\(.*\)/\1\2 started by init\3/' \
  -   src/init.c.backup > src/init.c</userinput></screen></para>
  +    src/init.c.backup > src/init.c</userinput></screen></para>
   
   <para>Install Sysvinit by running the following commands:</para>
   
  
  
  
  1.13      +2 -2      LFS/BOOK/chapter06/tar-inst.xml
  
  Index: tar-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/tar-inst.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- tar-inst.xml	27 Oct 2001 22:21:44 -0000	1.12
  +++ tar-inst.xml	2 May 2002 20:15:02 -0000	1.13
  @@ -14,8 +14,8 @@
   <para>Install Tar by running the following commands from the toplevel
   directory:</para>
   
  -<para><screen><userinput>./configure --prefix=/usr --libexecdir=/usr/bin \
  -   --bindir=/bin &&
  +<para><screen><userinput>./configure --prefix=/usr \
  +    --libexecdir=/usr/bin --bindir=/bin &&
   make &&
   make install</userinput></screen></para>
   
  
  
  
  1.10      +1 -1      LFS/BOOK/chapter06/textutils-inst.xml
  
  Index: textutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/textutils-inst.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- textutils-inst.xml	10 Feb 2002 15:36:19 -0000	1.9
  +++ textutils-inst.xml	2 May 2002 20:15:02 -0000	1.10
  @@ -6,7 +6,7 @@
   <para><screen><userinput>./configure --prefix=/usr &&
   make &&
   make install &&
  -mv /usr/bin/cat /usr/bin/head /bin</userinput></screen></para>
  +mv /usr/bin/{cat,head} /bin</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.23      +1 -1      LFS/BOOK/chapter06/utillinux-inst.xml
  
  Index: utillinux-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/utillinux-inst.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- utillinux-inst.xml	21 Jan 2002 23:32:13 -0000	1.22
  +++ utillinux-inst.xml	2 May 2002 20:15:02 -0000	1.23
  @@ -7,7 +7,7 @@
   
   <para><screen><userinput>cp hwclock/hwclock.c hwclock/hwclock.c.backup &&
   sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \
  -   hwclock/hwclock.c.backup > hwclock/hwclock.c &&
  +    hwclock/hwclock.c.backup > hwclock/hwclock.c &&
   mkdir -p /var/lib/hwclock</userinput></screen></para>
   
   </sect2>
  
  
  
  1.23      +2 -4      LFS/BOOK/chapter06/vim-inst.xml
  
  Index: vim-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/vim-inst.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- vim-inst.xml	29 Mar 2002 23:49:44 -0000	1.22
  +++ vim-inst.xml	2 May 2002 20:15:02 -0000	1.23
  @@ -12,8 +12,7 @@
   <para><screen><userinput>./configure --prefix=/usr &&
   make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &&
   make install &&
  -cd /usr/bin &&
  -ln -sf vim vi</userinput></screen></para>
  +ln -sf vim /usr/bin/vi</userinput></screen></para>
   
   <para>If you plan on installing the X Window system on your LFS
   system, you might want to re-compile Vim after you have installed X. Vim
  @@ -34,8 +33,7 @@
   <para><screen><userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &&
   make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &&
   make install &&
  -cd /usr/bin &&
  -ln -sf vim vi</userinput></screen></para>
  +ln -sf vim /usr/bin/vi</userinput></screen></para>
   
   </sect2>
   
  
  
  
-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe lfs-book' in the subject header of the message



More information about the lfs-book mailing list