diff options
| author | Mark Hymers <markh@linuxfromscratch.org> | 2001-10-27 22:21:44 +0000 |
|---|---|---|
| committer | Mark Hymers <markh@linuxfromscratch.org> | 2001-10-27 22:21:44 +0000 |
| commit | 4d6fc2dabb417f72752429222a3698ecc8a3c537 (patch) | |
| tree | 073c981871be15744ed5f6d72189f286975ea5f6 | |
| parent | 2443baaf497c491965623107d6fe4f4b505e06aa (diff) | |
[Bug 164] XML Tidy up
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1329 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
72 files changed, 419 insertions, 415 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 32bc19496..c49638195 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -31,6 +31,10 @@ </para></listitem> +<listitem><para>October 27th, 2001 [markh]: General: Large XML Tidy-up. +Shouldn't affect the book text or layout. If it does, something has +gone wrong!</para></listitem> + <listitem><para>October 27th, 2001 [markh]: Chapter 6: Added reiserfsprogs-3.x.0j and updated to lilo-22.0.2.</para></listitem> diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml index 70ff6a243..82572cbc4 100644 --- a/chapter05/bash-inst.xml +++ b/chapter05/bash-inst.xml @@ -15,18 +15,18 @@ or you just installed it, check for the two files again. Often the create <filename>libcurses.a</filename> as a symlink by running the following commands:</para> -<para><screen><userinput>cd /usr/lib &&</userinput> -<userinput>ln -s libncurses.a libcurses.a</userinput></screen></para> +<para><screen><userinput>cd /usr/lib && +ln -s libncurses.a 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 \</userinput> -<userinput> --bindir=$LFS/bin --with-curses &&</userinput> -<userinput>make &&</userinput> -<userinput>make install &&</userinput> -<userinput>cd $LFS/bin &&</userinput> -<userinput>ln -sf bash sh</userinput></screen></para> +<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> <para>If the make install phase ends with something along the lines of</para> diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml index 910cb6bae..ba383cdef 100644 --- a/chapter05/binutils-inst.xml +++ b/chapter05/binutils-inst.xml @@ -9,9 +9,9 @@ it comes with.</para> <para>Install Binutils by running the following commands:</para> -<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> -<userinput>make LDFLAGS=-all-static tooldir=$LFS/usr &&</userinput> -<userinput>make tooldir=$LFS/usr install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls && +make LDFLAGS=-all-static tooldir=$LFS/usr && +make tooldir=$LFS/usr install</userinput></screen></para> </sect2> diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml index 17ca0b59a..3dab1cf4c 100644 --- a/chapter05/bzip2-inst.xml +++ b/chapter05/bzip2-inst.xml @@ -3,10 +3,10 @@ <para>Install Bzip2 by running the following commands:</para> -<para><screen><userinput>make CC="gcc -static" &&</userinput> -<userinput>make PREFIX=$LFS/usr install &&</userinput> -<userinput>cd $LFS/usr/bin &&</userinput> -<userinput>mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput></screen></para> +<para><screen><userinput>make CC="gcc -static" && +make PREFIX=$LFS/usr install && +cd $LFS/usr/bin && +mv bzcat bunzip2 bzip2 bzip2recover $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 diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml index c10da0f8d..d0266cf73 100644 --- a/chapter05/diffutils-inst.xml +++ b/chapter05/diffutils-inst.xml @@ -7,18 +7,18 @@ following commands can be used in this case. Note that these commands can also be used for other glibc versions so if you aren't sure, then use the first version.</para> -<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> -<userinput>./configure --prefix=$LFS/usr &&</userinput> -<userinput>unset CPPFLAGS &&</userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 && +./configure --prefix=$LFS/usr && +unset CPPFLAGS && +make LDFLAGS=-static && +make install</userinput></screen></para> <para>If you are using a newer glibc version (2.2.x), you can use the following commands to install Diffutils:</para> -<para><screen><userinput>./configure --prefix=$LFS/usr &&</userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=$LFS/usr && +make LDFLAGS=-static && +make install</userinput></screen></para> </sect2> diff --git a/chapter05/fileutils-exp.xml b/chapter05/fileutils-exp.xml index 2a117d4e4..089e782ea 100644 --- a/chapter05/fileutils-exp.xml +++ b/chapter05/fileutils-exp.xml @@ -5,11 +5,11 @@ run this command in order to keep a backup of the file we are about to change.</para> -<para><screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup &&</userinput> -<userinput>sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput> -<userinput> -e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput> -<userinput> lib/Makefile.in > lib/Makefile.in~ &&</userinput> -<userinput>mv lib/Makefile.in~ lib/Makefile.in:</userinput></screen> +<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 > lib/Makefile.in~ && +mv lib/Makefile.in~ lib/Makefile.in:</userinput></screen> 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 diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml index 00e85a0ec..ab423617e 100644 --- a/chapter05/fileutils-inst.xml +++ b/chapter05/fileutils-inst.xml @@ -21,19 +21,20 @@ machines, run the following commands. Do <emphasis>not</emphasis> attempt this fix if you don't have Glibc-2.2.3 installed. It will more than likely result in all kinds of compile time problems.</para> -<para><screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup &&</userinput> -<userinput>sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput> -<userinput> -e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput> -<userinput> lib/Makefile.in > lib/Makefile.in~ &&</userinput> -<userinput>mv lib/Makefile.in~ lib/Makefile.in</userinput></screen></para> - -<para>Install fileutils by running the following commands: -<screen><userinput>./configure --disable-nls \</userinput> -<userinput> --prefix=$LFS/usr --libexecdir=$LFS/bin --bindir=$LFS/bin &&</userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install &&</userinput> -<userinput>cd $LFS/usr/bin &&</userinput> -<userinput>ln -sf ../../bin/install</userinput></screen></para> +<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 > lib/Makefile.in~ && +mv lib/Makefile.in~ lib/Makefile.in</userinput></screen></para> + +<para>Install fileutils by running the following commands:</para> + +<para><screen><userinput>./configure --disable-nls \ + --prefix=$LFS/usr --libexecdir=$LFS/bin --bindir=$LFS/bin && +make LDFLAGS=-static && +make install && +cd $LFS/usr/bin && +ln -sf ../../bin/install</userinput></screen></para> <para>Once you have installed fileutils, you can test whether the segmentation fault problem has been avoided by running diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index b82a11d39..f7dffd9ad 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -9,19 +9,19 @@ it comes with.</para> <para>Install GCC by running the following commands:</para> -<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &&</userinput> -<userinput>mkdir ../gcc-build &&</userinput> -<userinput>cd ../gcc-build &&</userinput> -<userinput>../gcc-&gcc-version;/configure --prefix=/usr --enable-languages=c,c++ \</userinput> -<userinput> --disable-nls --disable-shared --enable-threads=posix &&</userinput> -<userinput>make BOOT_LDFLAGS=-static bootstrap &&</userinput> -<userinput>make prefix=$LFS/usr install &&</userinput> -<userinput>cd $LFS/lib &&</userinput> -<userinput>ln -sf ../usr/bin/cpp &&</userinput> -<userinput>cd $LFS/usr/lib &&</userinput> -<userinput>ln -sf ../bin/cpp &&</userinput> -<userinput>cd $LFS/usr/bin &&</userinput> -<userinput>ln -sf gcc cc</userinput></screen></para> +<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch && +mkdir ../gcc-build && +cd ../gcc-build && +../gcc-&gcc-version;/configure --prefix=/usr --enable-languages=c,c++ \ + --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</userinput></screen></para> </sect2> diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml index 945da319d..22102fd1d 100644 --- a/chapter05/grep-inst.xml +++ b/chapter05/grep-inst.xml @@ -7,18 +7,18 @@ following commands can be used in this case. Note that these commands can also be used for other glibc versions so if you aren't sure, then use the first version.</para> -<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> -<userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> -<userinput>unset CPPFLAGS &&</userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 && +./configure --prefix=$LFS/usr --disable-nls && +unset CPPFLAGS && +make LDFLAGS=-static && +make install</userinput></screen></para> <para>If you are using a newer glibc version (2.2.x), you can use the following commands to install Grep:</para> -<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls && +make LDFLAGS=-static && +make install</userinput></screen></para> </sect2> diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml index 09e431d2d..d12031710 100644 --- a/chapter05/gzip-inst.xml +++ b/chapter05/gzip-inst.xml @@ -10,14 +10,15 @@ version, so if you aren't sure, it's best to apply it.</para> <para>Apply the patch by running the following command:</para> -<para><userinput>patch -Np1 -i ../gzip-&gzip-version;.patch</userinput></para> +<para><screen><userinput>patch -Np1 -i ../gzip-&gzip-version;.patch</userinput></screen></para> <para>Install Gzip by running the following commands:</para> -<para><screen><userinput>./configure --prefix=$LFS/usr &&</userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install &&</userinput> -<userinput>cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin &&</userinput> -<userinput>rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput></screen></para> + +<para><screen><userinput>./configure --prefix=$LFS/usr && +make LDFLAGS=-static && +make install && +cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin && +rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput></screen></para> </sect2> diff --git a/chapter05/kernel-inst.xml b/chapter05/kernel-inst.xml index 3ac2f4e01..4aca35b19 100644 --- a/chapter05/kernel-inst.xml +++ b/chapter05/kernel-inst.xml @@ -10,15 +10,15 @@ compile the packages that need the kernel.</para> <para>The kernel configuration file is created by running the following command:</para> -<para><screen><userinput>make mrproper &&</userinput> -<userinput>yes "" | make config &&</userinput> -<userinput>make dep &&</userinput> -<userinput>cd $LFS/usr/include &&</userinput> -<userinput>cp -a ../src/linux/include/linux . &&</userinput> -<userinput>chown -R root.root $LFS/usr/include/linux &&</userinput> -<userinput>mkdir asm &&</userinput> -<userinput>cp -a ../src/linux/include/asm/* asm &&</userinput> -<userinput>chown -R root.root $LFS/usr/include/asm</userinput></screen></para> +<para><screen><userinput>make mrproper && +yes "" | make config && +make dep && +cd $LFS/usr/include && +cp -a ../src/linux/include/linux . && +chown -R root.root $LFS/usr/include/linux && +mkdir asm && +cp -a ../src/linux/include/asm/* asm && +chown -R root.root $LFS/usr/include/asm</userinput></screen></para> </sect2> diff --git a/chapter05/make-inst.xml b/chapter05/make-inst.xml index 1e358f555..6130f8106 100644 --- a/chapter05/make-inst.xml +++ b/chapter05/make-inst.xml @@ -3,9 +3,9 @@ <para>Install Make by running the following commands:</para> -<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls && +make LDFLAGS=-static && +make install</userinput></screen></para> </sect2> diff --git a/chapter05/mawk-inst.xml b/chapter05/mawk-inst.xml index cd872df6c..030c4b9fc 100644 --- a/chapter05/mawk-inst.xml +++ b/chapter05/mawk-inst.xml @@ -3,10 +3,10 @@ <para>Install Mawk by running the following commands:</para> -<para><screen><userinput>./configure &&</userinput> -<userinput>make CC="gcc -static" &&</userinput> -<userinput>make BINDIR=$LFS/usr/bin \</userinput> -<userinput> MANDIR=$LFS/usr/share/man/man1 install</userinput></screen></para> +<para><screen><userinput>./configure && +make CC="gcc -static" && +make BINDIR=$LFS/usr/bin \ + MANDIR=$LFS/usr/share/man/man1 install</userinput></screen></para> </sect2> diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml index 7effdd3df..4eebac903 100644 --- a/chapter05/patch-inst.xml +++ b/chapter05/patch-inst.xml @@ -3,9 +3,9 @@ <para>Install Patch by running the following commands:</para> -<para><screen><userinput>./configure --prefix=$LFS/usr &&</userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=$LFS/usr && +make LDFLAGS=-static && +make install</userinput></screen></para> </sect2> diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml index 82b4d4978..377fd3d6a 100644 --- a/chapter05/sed-inst.xml +++ b/chapter05/sed-inst.xml @@ -7,18 +7,18 @@ following commands can be used in this case. Note that these commands can also be used for other glibc versions so if you aren't sure, then use the first version.</para> -<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> -<userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &&</userinput> -<userinput>unset CPPFLAGS &&</userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 && +./configure --prefix=$LFS/usr --bindir=$LFS/bin && +unset CPPFLAGS && +make LDFLAGS=-static && +make install</userinput></screen></para> <para>If you are using a newer glibc version (2.2.x), you can use the following commands to install Sed:</para> -<para><screen><userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &&</userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin && +make LDFLAGS=-static && +make install</userinput></screen></para> </sect2> diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml index 3aeb04da3..74f8def4f 100644 --- a/chapter05/shellutils-inst.xml +++ b/chapter05/shellutils-inst.xml @@ -13,12 +13,13 @@ best to apply 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><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install &&</userinput> -<userinput>cd $LFS/usr/bin &&</userinput> -<userinput>mv date echo false pwd stty $LFS/bin &&</userinput> -<userinput>mv su true uname hostname $LFS/bin</userinput></screen></para> + +<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls && +make LDFLAGS=-static && +make install && +cd $LFS/usr/bin && +mv date echo false pwd stty $LFS/bin && +mv su true uname hostname $LFS/bin</userinput></screen></para> </sect2> diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml index 55a7b3699..7b3bcc95d 100644 --- a/chapter05/tar-inst.xml +++ b/chapter05/tar-inst.xml @@ -12,10 +12,10 @@ for gzip files).</para> <para>Install Tar by running the following commands:</para> -<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls \</userinput> -<userinput> --libexecdir=$LFS/usr/bin --bindir=$LFS/bin && </userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls \ + --libexecdir=$LFS/usr/bin --bindir=$LFS/bin && +make LDFLAGS=-static && +make install</userinput></screen></para> </sect2> diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml index 84cd6d0df..02cf81fd1 100644 --- a/chapter05/texinfo-inst.xml +++ b/chapter05/texinfo-inst.xml @@ -3,9 +3,9 @@ <para>Install Texinfo by running the following commands:</para> -<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls && +make LDFLAGS=-static && +make install</userinput></screen></para> </sect2> diff --git a/chapter05/textutils-inst.xml b/chapter05/textutils-inst.xml index fc56d6f8d..d9ad8c448 100644 --- a/chapter05/textutils-inst.xml +++ b/chapter05/textutils-inst.xml @@ -3,10 +3,10 @@ <para>Install Textutils by running the following commands:</para> -<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> -<userinput>make LDFLAGS=-static &&</userinput> -<userinput>make install &&</userinput> -<userinput>mv $LFS/usr/bin/cat $LFS/bin</userinput></screen></para> +<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls && +make LDFLAGS=-static && +make install && +mv $LFS/usr/bin/cat $LFS/bin</userinput></screen></para> </sect2> diff --git a/chapter06/autoconf-inst.xml b/chapter06/autoconf-inst.xml index b6db92607..6549e7843 100644 --- a/chapter06/autoconf-inst.xml +++ b/chapter06/autoconf-inst.xml @@ -8,9 +8,9 @@ start experiencing any problems with this release.</para> <para>Install Autoconf by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/automake-inst.xml b/chapter06/automake-inst.xml index 6360a106a..d445c5398 100644 --- a/chapter06/automake-inst.xml +++ b/chapter06/automake-inst.xml @@ -8,8 +8,8 @@ start experiencing any problems with this release.</para> <para>Install Automake by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml index bb98043dd..0e113e9e9 100644 --- a/chapter06/bash-inst.xml +++ b/chapter06/bash-inst.xml @@ -3,11 +3,11 @@ <para>Install Bash by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr --with-curses \</userinput> -<userinput> --bindir=/bin &&</userinput> -<userinput>make &&</userinput> -<userinput>make install &&</userinput> -<userinput>exec /bin/bash --login</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr --with-curses \ + --bindir=/bin && +make && +make install && +exec /bin/bash --login</userinput></screen></para> </sect2> diff --git a/chapter06/bin86-inst.xml b/chapter06/bin86-inst.xml index a5e459049..5d82d48a1 100644 --- a/chapter06/bin86-inst.xml +++ b/chapter06/bin86-inst.xml @@ -14,8 +14,8 @@ you decide to skip this.</para> <para>Install Bin86 by running the following commands:</para> -<para><screen><userinput>make &&</userinput> -<userinput>make PREFIX=/usr install</userinput></screen></para> +<para><screen><userinput>make && +make PREFIX=/usr install</userinput></screen></para> </sect2> diff --git a/chapter06/binutils-inst.xml b/chapter06/binutils-inst.xml index 636dd3bb0..07456bab9 100644 --- a/chapter06/binutils-inst.xml +++ b/chapter06/binutils-inst.xml @@ -8,10 +8,10 @@ it comes with.</para> <para>Install Binutils by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr --enable-shared &&</userinput> -<userinput>make tooldir=/usr &&</userinput> -<userinput>make tooldir=/usr install &&</userinput> -<userinput>make tooldir=/usr install-info</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr --enable-shared && +make tooldir=/usr && +make tooldir=/usr install && +make tooldir=/usr install-info</userinput></screen></para> </sect2> diff --git a/chapter06/bison-inst.xml b/chapter06/bison-inst.xml index 06bcbfb9f..e59ab8dd9 100644 --- a/chapter06/bison-inst.xml +++ b/chapter06/bison-inst.xml @@ -3,10 +3,10 @@ <para>Install Bison by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr \</userinput> -<userinput> --datadir=/usr/share/bison &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr \ + --datadir=/usr/share/bison && +make && +make install</userinput></screen></para> <para>Some programs don't know about bison and try to find the yacc program (bison is a (better) alternative for yacc). So to please those few @@ -23,8 +23,8 @@ following:</para> exec /usr/bin/bison -y "$@" # End /usr/bin/yacc -<userinput>EOF</userinput> -<userinput>chmod 755 /usr/bin/yacc</userinput></screen></para> +<userinput>EOF +chmod 755 /usr/bin/yacc</userinput></screen></para> </sect2> diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml index 5366bc9a1..905e4eb53 100644 --- a/chapter06/bzip2-inst.xml +++ b/chapter06/bzip2-inst.xml @@ -3,25 +3,25 @@ <para>Install Bzip2 by running the following commands:</para> -<para><screen><userinput>make -f Makefile-libbz2_so &&</userinput> -<userinput>make bzip2recover libbz2.a &&</userinput> -<userinput>ln -s libbz2.so.1.0.1 libbz2.so &&</userinput> -<userinput>cp bzip2-shared /bin/bzip2 &&</userinput> -<userinput>cp bzip2recover /bin &&</userinput> -<userinput>cp bzip2.1 /usr/share/man/man1 &&</userinput> -<userinput>cp bzlib.h /usr/include &&</userinput> -<userinput>cp -a libbz2.so* /lib &&</userinput> -<userinput>rm /usr/lib/libbz2.a &&</userinput> -<userinput>cp libbz2.a /usr/lib &&</userinput> -<userinput>cd /usr/lib &&</userinput> -<userinput>ln -sf ../../lib/libbz2.so &&</userinput> -<userinput>cd /bin &&</userinput> -<userinput>ln -sf bzip2 bunzip2 &&</userinput> -<userinput>ln -sf bzip2 bzcat &&</userinput> -<userinput>cd /usr/share/man/man1 &&</userinput> -<userinput>ln -sf bzip2.1 bunzip2.1 &&</userinput> -<userinput>ln -sf bzip2.1 bzcat.1 &&</userinput> -<userinput>ln -sf bzip2.1 bzip2recover.1</userinput></screen></para> +<para><screen><userinput>make -f Makefile-libbz2_so && +make bzip2recover libbz2.a && +ln -s libbz2.so.1.0.1 libbz2.so && +cp bzip2-shared /bin/bzip2 && +cp bzip2recover /bin && +cp bzip2.1 /usr/share/man/man1 && +cp bzlib.h /usr/include && +cp -a libbz2.so* /lib && +rm /usr/lib/libbz2.a && +cp libbz2.a /usr/lib && +cd /usr/lib && +ln -sf ../../lib/libbz2.so && +cd /bin && +ln -sf bzip2 bunzip2 && +ln -sf bzip2 bzcat && +cd /usr/share/man/man1 && +ln -sf bzip2.1 bunzip2.1 && +ln -sf bzip2.1 bzcat.1 && +ln -sf bzip2.1 bzip2recover.1</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 diff --git a/chapter06/chrootcmd.xml b/chapter06/chrootcmd.xml index 79e3a60e2..e7ea6bdde 100644 --- a/chapter06/chrootcmd.xml +++ b/chapter06/chrootcmd.xml @@ -1,3 +1,3 @@ -<userinput>cd $LFS &&</userinput> -<userinput>chroot $LFS /usr/bin/env -i HOME=/root \</userinput> -<userinput> TERM=$TERM /bin/bash --login</userinput> +<userinput>cd $LFS && +chroot $LFS /usr/bin/env -i HOME=/root \ + TERM=$TERM /bin/bash --login</userinput> diff --git a/chapter06/config-glibc.xml b/chapter06/config-glibc.xml index 3c5fb97ce..ffff4ee12 100644 --- a/chapter06/config-glibc.xml +++ b/chapter06/config-glibc.xml @@ -38,8 +38,8 @@ location of the needed timezone file.</para> <para> Create the <filename class="directory">/etc/localtime</filename> symlink by running:</para> -<para><screen><userinput>cd /etc &&</userinput> -<userinput>ln -sf ../usr/share/zoneinfo/<tzselect's output> localtime</userinput></screen></para> +<para><screen><userinput>cd /etc && +ln -sf ../usr/share/zoneinfo/<tzselect's output> localtime</userinput></screen></para> <para>tzselect's output can be something like <emphasis>EST5EDT</emphasis> or <emphasis>Canada/Eastern</emphasis>.</para> diff --git a/chapter06/create-utmp.xml b/chapter06/create-utmp.xml index 3c8dcd756..903f5993d 100644 --- a/chapter06/create-utmp.xml +++ b/chapter06/create-utmp.xml @@ -11,10 +11,10 @@ bad login attempts.</para> <para>Create these files with their proper permissions by running the following commands:</para> -<para><screen><userinput>touch /var/run/utmp /var/log/wtmp \</userinput> -<userinput> /var/log/btmp /var/log/lastlog &&</userinput> -<userinput>chmod 644 /var/run/utmp /var/log/wtmp \</userinput> -<userinput> /var/log/btmp /var/log/lastlog</userinput></screen></para> +<para><screen><userinput>touch /var/run/utmp /var/log/wtmp \ + /var/log/btmp /var/log/lastlog && +chmod 644 /var/run/utmp /var/log/wtmp \ + /var/log/btmp /var/log/lastlog</userinput></screen></para> </sect2> diff --git a/chapter06/diffutils-inst.xml b/chapter06/diffutils-inst.xml index 527866a22..67f279bd9 100644 --- a/chapter06/diffutils-inst.xml +++ b/chapter06/diffutils-inst.xml @@ -3,9 +3,9 @@ <para>Install Diffutils by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/e2fsprogs-inst.xml b/chapter06/e2fsprogs-inst.xml index 30ca7c972..c88bc23f7 100644 --- a/chapter06/e2fsprogs-inst.xml +++ b/chapter06/e2fsprogs-inst.xml @@ -3,11 +3,11 @@ <para>Install E2fsprogs by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr --with-root-prefix="" \</userinput> -<userinput> --enable-elf-shlibs &&</userinput> -<userinput>make &&</userinput> -<userinput>make install &&</userinput> -<userinput>make install-libs</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr --with-root-prefix="" \ + --enable-elf-shlibs && +make && +make install && +make install-libs</userinput></screen></para> </sect2> diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml index e464ed438..ba774a895 100644 --- a/chapter06/ed-inst.xml +++ b/chapter06/ed-inst.xml @@ -8,15 +8,15 @@ need to use ed, you can skip it.</para> <para>Install Ed by running the following commands:</para> -<para><screen><userinput>cp buf.c buf.c.backup &&</userinput> -<userinput>sed 's/int u/int u, sfd/' buf.c.backup | \</userinput> -<userinput> sed '/.*\*mktemp.*/d' | \</userinput> -<userinput> sed 's/.*if (mktemp.*/ sfd = mkstemp(sfn);\</userinput> -<userinput> if ((sfd == -1) || (sfp = fopen (sfn, "w+")) == NULL)/' > buf.c &&</userinput> -<userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install &&</userinput> -<userinput>mv /usr/bin/ed /usr/bin/red /bin</userinput></screen></para> +<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 && +./configure --prefix=/usr && +make && +make install && +mv /usr/bin/ed /usr/bin/red /bin</userinput></screen></para> </sect2> diff --git a/chapter06/file-inst.xml b/chapter06/file-inst.xml index cc1e0990c..01c4284f2 100644 --- a/chapter06/file-inst.xml +++ b/chapter06/file-inst.xml @@ -3,11 +3,11 @@ <para>Install File by running the following commands:</para> -<para><screen><userinput>cp readelf.h readelf.h.backup &&</userinput> -<userinput>sed $'/#define __/a \\\n#include <stdint.h>' readelf.h.backup > readelf.h &&</userinput> -<userinput>./configure --prefix=/usr --datadir=/usr/share/misc &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>cp readelf.h readelf.h.backup && +sed $'/#define __/a \\\n#include <stdint.h>' readelf.h.backup > readelf.h && +./configure --prefix=/usr --datadir=/usr/share/misc && +make && +make install</userinput></screen></para> <para>File uses magic numbers to determine a file type. These magic numbers come with File in a plain text file. File internally compiles this database diff --git a/chapter06/fileutils-inst.xml b/chapter06/fileutils-inst.xml index 4374d77b7..8cfabe762 100644 --- a/chapter06/fileutils-inst.xml +++ b/chapter06/fileutils-inst.xml @@ -3,10 +3,10 @@ <para>Install Fileutils by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr --bindir=/bin \</userinput> -<userinput> --libexecdir=/bin &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin \ + --libexecdir=/bin && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/findutils-inst.xml b/chapter06/findutils-inst.xml index ea032aa63..8f2dba599 100644 --- a/chapter06/findutils-inst.xml +++ b/chapter06/findutils-inst.xml @@ -6,10 +6,10 @@ to be unpacked.</para> <para>Install Findutils by running the following commands:</para> -<para><screen><userinput>patch -Np1 -i ../findutils-4.1.patch &&</userinput> -<userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make libexecdir=/usr/bin install</userinput></screen></para> +<para><screen><userinput>patch -Np1 -i ../findutils-4.1.patch && +./configure --prefix=/usr && +make && +make libexecdir=/usr/bin install</userinput></screen></para> </sect2> diff --git a/chapter06/flex-inst.xml b/chapter06/flex-inst.xml index abea4ae41..a6dcbaf90 100644 --- a/chapter06/flex-inst.xml +++ b/chapter06/flex-inst.xml @@ -3,11 +3,11 @@ <para>Install Flex by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install &&</userinput> -<userinput>cd /usr/bin &&</userinput> -<userinput>ln -sf flex lex</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install && +cd /usr/bin && +ln -sf flex lex</userinput></screen></para> </sect2> diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml index 3f050d728..f9510506f 100644 --- a/chapter06/gcc-inst.xml +++ b/chapter06/gcc-inst.xml @@ -17,13 +17,13 @@ are available.</para> <para>Note: the build of other compilers is not tested by the people who actively work on LFS.</para> -<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &&</userinput> -<userinput>mkdir ../gcc-build &&</userinput> -<userinput>cd ../gcc-build &&</userinput> -<userinput>../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \</userinput> -<userinput> --enable-languages=c,c++ --enable-threads=posix &&</userinput> -<userinput>make bootstrap &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch && +mkdir ../gcc-build && +cd ../gcc-build && +../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \ + --enable-languages=c,c++ --enable-threads=posix && +make bootstrap && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/gettext-inst.xml b/chapter06/gettext-inst.xml index 384ced5c5..8eb08d5b3 100644 --- a/chapter06/gettext-inst.xml +++ b/chapter06/gettext-inst.xml @@ -3,9 +3,9 @@ <para>Install Gettext by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index 4237ec70c..96991e865 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -14,26 +14,26 @@ it comes with.</para> <para>Install Glibc by running the following commands:</para> -<para><screen><userinput>mknod -m 0666 /dev/null c 1 3 &&</userinput> -<userinput>touch /etc/ld.so.conf &&</userinput> -<userinput>cp malloc/Makefile malloc/Makefile.backup &&</userinput> -<userinput>sed 's%\$(PERL)%/usr/bin/perl%' malloc/Makefile > tmp~ &&</userinput> -<userinput>mv tmp~ malloc/Makefile &&</userinput> -<userinput>cp login/Makefile login/Makefile.backup &&</userinput> -<userinput>sed 's/root/0/' login/Makefile > tmp~ &&</userinput> -<userinput>mv tmp~ login/Makefile &&</userinput> -<userinput>mkdir ../glibc-build &&</userinput> -<userinput>cd ../glibc-build &&</userinput> -<userinput>../glibc-&glibc-version;/configure --prefix=/usr \</userinput> -<userinput> --enable-add-ons --libexecdir=/usr/bin &&</userinput> -<userinput>cp config.make config.make.backup &&</userinput> -<userinput>sed 's/cross-compiling = yes/cross-compiling = no/' \</userinput> -<userinput> config.make > tmp~ &&</userinput> -<userinput>mv tmp~ config.make &&</userinput> -<userinput>make &&</userinput> -<userinput>make install &&</userinput> -<userinput>make localedata/install-locales &&</userinput> -<userinput>exec /bin/bash --login</userinput></screen></para> +<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 > tmp~ && +mv tmp~ malloc/Makefile && +cp login/Makefile login/Makefile.backup && +sed 's/root/0/' login/Makefile > tmp~ && +mv tmp~ login/Makefile && +mkdir ../glibc-build && +cd ../glibc-build && +../glibc-&glibc-version;/configure --prefix=/usr \ + --enable-add-ons --libexecdir=/usr/bin && +cp config.make config.make.backup && +sed 's/cross-compiling = yes/cross-compiling = no/' \ + config.make > tmp~ && +mv tmp~ config.make && +make && +make install && +make localedata/install-locales && +exec /bin/bash --login</userinput></screen></para> <para>An alternative to running <userinput>make localedata/install-locales</userinput> is to only install those locales diff --git a/chapter06/grep-inst.xml b/chapter06/grep-inst.xml index 43dababa1..7620afcd5 100644 --- a/chapter06/grep-inst.xml +++ b/chapter06/grep-inst.xml @@ -3,9 +3,9 @@ <para>Install Grep by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/groff-inst.xml b/chapter06/groff-inst.xml index 7f7d16fad..4ee97b4bf 100644 --- a/chapter06/groff-inst.xml +++ b/chapter06/groff-inst.xml @@ -3,9 +3,9 @@ <para>Install Groff by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml index 4614a2e8c..4a08534d7 100644 --- a/chapter06/gzip-inst.xml +++ b/chapter06/gzip-inst.xml @@ -3,17 +3,17 @@ <para>Install Gzip by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install &&</userinput> -<userinput>cd /usr/bin &&</userinput> -<userinput>mv gzip /bin &&</userinput> -<userinput>rm gunzip zcat &&</userinput> -<userinput>cd /bin &&</userinput> -<userinput>ln -sf gzip gunzip &&</userinput> -<userinput>ln -sf gzip zcat &&</userinput> -<userinput>ln -sf gzip compress &&</userinput> -<userinput>ln -sf gunzip uncompress</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install && +cd /usr/bin && +mv gzip /bin && +rm gunzip zcat && +cd /bin && +ln -sf gzip gunzip && +ln -sf gzip zcat && +ln -sf gzip compress && +ln -sf gunzip uncompress</userinput></screen></para> </sect2> diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml index 7b2b2aad2..80e0b3559 100644 --- a/chapter06/kbd-inst.xml +++ b/chapter06/kbd-inst.xml @@ -3,9 +3,9 @@ <para>Install Kbd by running the following commands:</para> -<para><screen><userinput>./configure &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure && +make && +make install</userinput></screen></para> <para>When using the loadkeys program from this package, don't use the -d option to load a default keymap file. It won't work properly diff --git a/chapter06/less-inst.xml b/chapter06/less-inst.xml index 0a1edeaa0..f78702af2 100644 --- a/chapter06/less-inst.xml +++ b/chapter06/less-inst.xml @@ -3,9 +3,9 @@ <para>Install Less by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/libtool-inst.xml b/chapter06/libtool-inst.xml index c0c861846..8e5774a28 100644 --- a/chapter06/libtool-inst.xml +++ b/chapter06/libtool-inst.xml @@ -3,9 +3,9 @@ <para>Install Libtool by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/lilo-inst.xml b/chapter06/lilo-inst.xml index 953631e5c..46994267e 100644 --- a/chapter06/lilo-inst.xml +++ b/chapter06/lilo-inst.xml @@ -9,8 +9,8 @@ url="&hints-root;grub-howto.txt">&hints-root;grub-howto.txt</ulink>, <para>Install Lilo by running the following commands:</para> -<para><screen><userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>make && +make install</userinput></screen></para> <para>It appears that compilation of this package fails on certain machines when the -g compiler flag is being used. If you can't compile Lilo at diff --git a/chapter06/m4-inst.xml b/chapter06/m4-inst.xml index 5f061b477..dc1e367b1 100644 --- a/chapter06/m4-inst.xml +++ b/chapter06/m4-inst.xml @@ -3,9 +3,9 @@ <para>Install M4 by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/make-inst.xml b/chapter06/make-inst.xml index bf818f27c..64a952a4c 100644 --- a/chapter06/make-inst.xml +++ b/chapter06/make-inst.xml @@ -3,9 +3,9 @@ <para>Install Make by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/makedev-inst.xml b/chapter06/makedev-inst.xml index 9d56aae75..7b93816ad 100644 --- a/chapter06/makedev-inst.xml +++ b/chapter06/makedev-inst.xml @@ -6,9 +6,9 @@ won't create a directory for you to cd into.</para> <para>Create the device files by running the following commands:</para> -<para><screen><userinput>cp MAKEDEV-&makedev-version; /dev/MAKEDEV &&</userinput> -<userinput>cd /dev &&</userinput> -<userinput>chmod 754 MAKEDEV</userinput></screen></para> +<para><screen><userinput>cp MAKEDEV-&makedev-version; /dev/MAKEDEV && +cd /dev && +chmod 754 MAKEDEV</userinput></screen></para> <para>Now, depending on whether you are going to use devpts or not, you can run one of two commands:</para> diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index c6329e37d..a2c331b93 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -3,16 +3,16 @@ <para>Run the following commands to install man:</para> -<para><screen><userinput>for i in configure src/Makefile.in src/makewhatis.sh</userinput> -<userinput>do</userinput> -<userinput> cp $i $i.backup &&</userinput> -<userinput> sed 's/gawk/awk/g' $i > tmp~ &&</userinput> -<userinput> mv tmp~ $i</userinput> -<userinput>done &&</userinput> -<userinput>chmod 755 configure &&</userinput> -<userinput>./configure -default &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>for i in configure src/Makefile.in src/makewhatis.sh +do + cp $i $i.backup && + sed 's/gawk/awk/g' $i > tmp~ && + mv tmp~ $i +done && +chmod 755 configure && +./configure -default && +make && +make install</userinput></screen></para> <para>You may want to take a look at the man hint at <ulink url="&hints-root;man.txt">&hints-root;man.txt</ulink> diff --git a/chapter06/manpages-inst.xml b/chapter06/manpages-inst.xml index cb9ae2b2d..09caad3ff 100644 --- a/chapter06/manpages-inst.xml +++ b/chapter06/manpages-inst.xml @@ -4,8 +4,8 @@ <para>Before man-pages is installed, the patch file has to be unpacked. Install Man-pages by running the following commands:</para> -<para><screen><userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/mawk-inst.xml b/chapter06/mawk-inst.xml index 3ae513357..199bd0f56 100644 --- a/chapter06/mawk-inst.xml +++ b/chapter06/mawk-inst.xml @@ -3,12 +3,12 @@ <para>Install Mawk by running the following commands:</para> -<para><screen><userinput>./configure &&</userinput> -<userinput>make &&</userinput> -<userinput>make BINDIR=/usr/bin \</userinput> -<userinput> MANDIR=/usr/share/man/man1 install &&</userinput> -<userinput>cd /usr/bin &&</userinput> -<userinput>ln -sf mawk awk</userinput></screen></para> +<para><screen><userinput>./configure && +make && +make BINDIR=/usr/bin \ + MANDIR=/usr/share/man/man1 install && +cd /usr/bin && +ln -sf mawk awk</userinput></screen></para> </sect2> diff --git a/chapter06/modutils-inst.xml b/chapter06/modutils-inst.xml index 5d6733d91..8fae0d674 100644 --- a/chapter06/modutils-inst.xml +++ b/chapter06/modutils-inst.xml @@ -3,9 +3,9 @@ <para>Install Modutils by running the following commands:</para> -<para><screen><userinput>./configure &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml index bcc70e08c..9329fc1dd 100644 --- a/chapter06/ncurses-inst.xml +++ b/chapter06/ncurses-inst.xml @@ -3,19 +3,19 @@ <para>Install Ncurses by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr --libdir=/lib \</userinput> -<userinput> --with-shared --disable-termcap &&</userinput> -<userinput>make &&</userinput> -<userinput>make install &&</userinput> -<userinput>cd /lib &&</userinput> -<userinput>mv *.a /usr/lib &&</userinput> -<userinput>chmod 755 *.5.2 &&</userinput> -<userinput>cd /usr/lib &&</userinput> -<userinput>ln -sf libncurses.a libcurses.a &&</userinput> -<userinput>ln -sf ../../lib/libncurses.so &&</userinput> -<userinput>ln -sf ../../lib/libcurses.so &&</userinput> -<userinput>ln -sf ../../lib/libform.so &&</userinput> -<userinput>ln -sf ../../lib/libpanel.so &&</userinput> -<userinput>ln -sf ../../lib/libmenu.so</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr --libdir=/lib \ + --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> </sect2> diff --git a/chapter06/netkitbase-inst.xml b/chapter06/netkitbase-inst.xml index 512d7bc17..e6c5ef440 100644 --- a/chapter06/netkitbase-inst.xml +++ b/chapter06/netkitbase-inst.xml @@ -3,11 +3,11 @@ <para>Install Netkit-base by running the following commands:</para> -<para><screen><userinput>./configure &&</userinput> -<userinput>make &&</userinput> -<userinput>make install &&</userinput> -<userinput>cd etc.sample &&</userinput> -<userinput>cp services protocols /etc</userinput></screen></para> +<para><screen><userinput>./configure && +make && +make install && +cd etc.sample && +cp services protocols /etc</userinput></screen></para> <para>There are other files in the <filename class="directory">etc.sample</filename> directory which might be of diff --git a/chapter06/nettools-inst.xml b/chapter06/nettools-inst.xml index 51a74e209..7fb66dde5 100644 --- a/chapter06/nettools-inst.xml +++ b/chapter06/nettools-inst.xml @@ -3,8 +3,8 @@ <para>Install Net-tools by running the following commands:</para> -<para><screen><userinput>make &&</userinput> -<userinput>make update</userinput></screen></para> +<para><screen><userinput>make && +make update</userinput></screen></para> </sect2> diff --git a/chapter06/patch-inst.xml b/chapter06/patch-inst.xml index bf921f26f..c985d8682 100644 --- a/chapter06/patch-inst.xml +++ b/chapter06/patch-inst.xml @@ -3,9 +3,9 @@ <para>Install Patch by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/perl-inst.xml b/chapter06/perl-inst.xml index 3c0133859..0ac7a39ab 100644 --- a/chapter06/perl-inst.xml +++ b/chapter06/perl-inst.xml @@ -3,9 +3,9 @@ <para>Install Perl by running the following commands:</para> -<para><screen><userinput>./Configure -Dprefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./Configure -Dprefix=/usr && +make && +make install</userinput></screen></para> <para>If you don't want to answer all those questions Perl asks, you can add the -d option to the configure script and Perl will use all the @@ -13,9 +13,9 @@ default settings. To avoid the Configure script asking questions after the config.sh file has been created you can pass the -e parameter to perl as well. The commands with these parameters included will be:</para> -<para><screen><userinput>./Configure -Dprefix=/usr -d -e &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./Configure -Dprefix=/usr -d -e && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/procinfo-inst.xml b/chapter06/procinfo-inst.xml index 73ac5d067..fde7a6653 100644 --- a/chapter06/procinfo-inst.xml +++ b/chapter06/procinfo-inst.xml @@ -3,8 +3,8 @@ <para>Install Procinfo by running the following commands:</para> -<para><screen><userinput>make LDLIBS=-lncurses &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>make LDLIBS=-lncurses && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml index 29ff3d5f6..d5bb0ce68 100644 --- a/chapter06/procps-inst.xml +++ b/chapter06/procps-inst.xml @@ -3,9 +3,9 @@ <para>Install Procps by running the following commands:</para> -<para><screen><userinput>make &&</userinput> -<userinput>make XSCPT='' install &&</userinput> -<userinput>mv /usr/bin/kill /bin</userinput></screen></para> +<para><screen><userinput>make && +make XSCPT='' install && +mv /usr/bin/kill /bin</userinput></screen></para> </sect2> diff --git a/chapter06/psmisc-inst.xml b/chapter06/psmisc-inst.xml index 7fd1f51d5..933657e23 100644 --- a/chapter06/psmisc-inst.xml +++ b/chapter06/psmisc-inst.xml @@ -3,9 +3,9 @@ <para>Install Psmisc by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr --exec-prefix=/ &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr --exec-prefix=/ && +make && +make install</userinput></screen></para> <para>psmisc installs the <filename>/usr/share/man/man1/pidof.1</filename> man page, but psmisc's @@ -23,8 +23,8 @@ should remove psmisc's pidof man page by running:</para> package's installation by creating the <filename>/bin/pidof</filename> symlink by running:</para> -<para><screen><userinput>cd /bin</userinput> -<userinput>ln -s killall pidof</userinput></screen></para> +<para><screen><userinput>cd /bin +ln -s killall pidof</userinput></screen></para> </sect2> diff --git a/chapter06/reiserfs-inst.xml b/chapter06/reiserfs-inst.xml index cac679bfd..ea90f7e50 100644 --- a/chapter06/reiserfs-inst.xml +++ b/chapter06/reiserfs-inst.xml @@ -5,9 +5,9 @@ the reiserfs filesystem. Install Reiserfsprogs by running the following commands:</para> -<para><screen><userinput>./configure --mandir=/usr/share/man &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --mandir=/usr/share/man && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/sed-inst.xml b/chapter06/sed-inst.xml index bded36b7b..0c1923b24 100644 --- a/chapter06/sed-inst.xml +++ b/chapter06/sed-inst.xml @@ -3,9 +3,9 @@ <para>Install Sed by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index b052cc646..ae75a25b7 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/chapter06/shadowpwd-inst.xml @@ -9,22 +9,22 @@ passwords and how to get the most out of this Shadow package.</para> <para>Install the Shadow Password Suite by running the following commands:</para> -<para><screen><userinput>cp src/useradd.c src/useradd.c.backup &&</userinput> -<userinput>sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' \</userinput> -<userinput> src/useradd.c > tmp~ &&</userinput> -<userinput>mv tmp~ src/useradd.c &&</userinput> -<userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install &&</userinput> -<userinput>cd etc &&</userinput> -<userinput>cp limits login.access /etc &&</userinput> -<userinput>sed 's%/var/spool/mail%/var/mail%' login.defs.linux > /etc/login.defs &&</userinput> -<userinput>cd /lib &&</userinput> -<userinput>mv libshadow.a /usr/lib &&</userinput> -<userinput>mv libshadow.la /usr/lib &&</userinput> -<userinput>ln -sf libshadow.so.0 libshadow.so &&</userinput> -<userinput>cd /usr/lib &&</userinput> -<userinput>ln -sf ../../lib/libshadow.so</userinput></screen></para> +<para><screen><userinput>cp src/useradd.c src/useradd.c.backup && +sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' \ + src/useradd.c > tmp~ && +mv tmp~ src/useradd.c && +./configure --prefix=/usr && +make && +make install && +cd etc && +cp limits login.access /etc && +sed 's%/var/spool/mail%/var/mail%' login.defs.linux > /etc/login.defs && +cd /lib && +mv libshadow.a /usr/lib && +mv libshadow.la /usr/lib && +ln -sf libshadow.so.0 libshadow.so && +cd /usr/lib && +ln -sf ../../lib/libshadow.so</userinput></screen></para> </sect2> diff --git a/chapter06/shellutils-inst.xml b/chapter06/shellutils-inst.xml index 492ecfcf3..cd1f44b26 100644 --- a/chapter06/shellutils-inst.xml +++ b/chapter06/shellutils-inst.xml @@ -3,13 +3,13 @@ <para>Install Shellutils by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install &&</userinput> -<userinput>cd /usr/bin &&</userinput> -<userinput>mv date echo false pwd stty /bin &&</userinput> -<userinput>mv su true uname hostname /bin &&</userinput> -<userinput>mv chroot ../sbin</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install && +cd /usr/bin && +mv date echo false pwd stty /bin && +mv su true uname hostname /bin && +mv chroot ../sbin</userinput></screen></para> </sect2> diff --git a/chapter06/sysklogd-inst.xml b/chapter06/sysklogd-inst.xml index 6e01e274c..ea209b143 100644 --- a/chapter06/sysklogd-inst.xml +++ b/chapter06/sysklogd-inst.xml @@ -3,8 +3,8 @@ <para>Install Sysklogd by running the following commands:</para> -<para><screen><userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml index fde648bf3..5b1067718 100644 --- a/chapter06/sysvinit-inst.xml +++ b/chapter06/sysvinit-inst.xml @@ -11,15 +11,15 @@ change the init.c file so that the sentence reads "sending all processes started by init the TERM signal" by running the following commands. If you don't want to change it, skip it.</para> -<para><screen><userinput>cp src/init.c src/init.c.backup &&</userinput> -<userinput>sed 's/\(.*\)\(Sending processes\)\(.*\)/\1\2 started by init\3/' \</userinput> -<userinput> src/init.c > tmp~ &&</userinput> -<userinput>mv tmp~ src/init.c</userinput></screen></para> +<para><screen><userinput>cp src/init.c src/init.c.backup && +sed 's/\(.*\)\(Sending processes\)\(.*\)/\1\2 started by init\3/' \ + src/init.c > tmp~ && +mv tmp~ src/init.c</userinput></screen></para> <para>Install Sysvinit by running the following commands:</para> -<para><screen><userinput>make -C src &&</userinput> -<userinput>make -C src install</userinput></screen></para> +<para><screen><userinput>make -C src && +make -C src install</userinput></screen></para> </sect2> diff --git a/chapter06/tar-inst.xml b/chapter06/tar-inst.xml index ceccf1226..39746b74d 100644 --- a/chapter06/tar-inst.xml +++ b/chapter06/tar-inst.xml @@ -14,10 +14,10 @@ for gzip files).</para> <para>Install Tar by running the following commands from the toplevel directory:</para> -<para><screen><userinput>./configure --prefix=/usr --libexecdir=/usr/bin \</userinput> -<userinput> --bindir=/bin &&</userinput> -<userinput>make &&</userinput> -<userinput>make install</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr --libexecdir=/usr/bin \ + --bindir=/bin && +make && +make install</userinput></screen></para> </sect2> diff --git a/chapter06/texinfo-inst.xml b/chapter06/texinfo-inst.xml index d52951b08..946a99321 100644 --- a/chapter06/texinfo-inst.xml +++ b/chapter06/texinfo-inst.xml @@ -3,10 +3,10 @@ <para>Install Texinfo by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install &&</userinput> -<userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install && +make TEXMF=/usr/share/texmf install-tex</userinput></screen></para> </sect2> diff --git a/chapter06/textutils-inst.xml b/chapter06/textutils-inst.xml index c22802455..43088ac18 100644 --- a/chapter06/textutils-inst.xml +++ b/chapter06/textutils-inst.xml @@ -3,10 +3,10 @@ <para>Install Textutils by running the following commands:</para> -<para><screen><userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> -<userinput>make install &&</userinput> -<userinput>mv /usr/bin/cat /bin</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/usr && +make && +make install && +mv /usr/bin/cat /bin</userinput></screen></para> </sect2> diff --git a/chapter06/utillinux-inst.xml b/chapter06/utillinux-inst.xml index 80d91753c..bee848020 100644 --- a/chapter06/utillinux-inst.xml +++ b/chapter06/utillinux-inst.xml @@ -5,11 +5,11 @@ adjtime file, instead of the usual /etc. To make hwclock, which is part of the util-linux package, FHS-compliant, run the following.</para> -<para><screen><userinput>cp hwclock/hwclock.c hwclock/hwclock.c.backup &&</userinput> -<userinput>sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \</userinput> -<userinput> hwclock/hwclock.c > tmp~ &&</userinput> -<userinput>mv tmp~ hwclock/hwclock.c &&</userinput> -<userinput>mkdir -p /var/lib/hwclock</userinput></screen></para> +<para><screen><userinput>cp hwclock/hwclock.c hwclock/hwclock.c.backup && +sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \ + hwclock/hwclock.c > tmp~ && +mv tmp~ hwclock/hwclock.c && +mkdir -p /var/lib/hwclock</userinput></screen></para> </sect2> @@ -18,9 +18,9 @@ util-linux package, FHS-compliant, run the following.</para> <para>Install Util-Linux by running the following commands:</para> -<para><screen><userinput>./configure &&</userinput> -<userinput>make HAVE_SLN=yes ADD_RAW=yes &&</userinput> -<userinput>make HAVE_SLN=yes ADD_RAW=yes install</userinput></screen></para> +<para><screen><userinput>./configure && +make HAVE_SLN=yes ADD_RAW=yes && +make HAVE_SLN=yes ADD_RAW=yes install</userinput></screen></para> </sect2> diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml index 1e25a0f17..176ff9300 100644 --- a/chapter06/vim-inst.xml +++ b/chapter06/vim-inst.xml @@ -9,21 +9,21 @@ which are currently available are for Emacs, Joe and nano.</para> <para>Install Vim by running the following commands:</para> -<para><screen><userinput>sed '/shUntil\|link shRepeat/{</userinput> -<userinput> /shUntil/N</userinput> -<userinput> /^/i\</userinput> -<userinput> if exists("b:is_kornshell") || exists("b:is_bash")</userinput> -<userinput> p</userinput> -<userinput> /$/i\</userinput> -<userinput> endif</userinput> -<userinput> d</userinput> -<userinput> }' runtime/syntax/sh.vim > sh.vim.fixed &&</userinput> -<userinput>mv sh.vim.fixed runtime/syntax/sh.vim &&</userinput> -<userinput>./configure --prefix=/usr &&</userinput> -<userinput>make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &&</userinput> -<userinput>make install &&</userinput> -<userinput>cd /usr/bin &&</userinput> -<userinput>ln -sf vim vi</userinput></screen></para> +<para><screen><userinput>sed '/shUntil\|link shRepeat/{ + /shUntil/N + /^/i\ + if exists("b:is_kornshell") || exists("b:is_bash") + p + /$/i\ + endif + d + }' runtime/syntax/sh.vim > sh.vim.fixed && +mv sh.vim.fixed runtime/syntax/sh.vim && +./configure --prefix=/usr && +make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" && +make install && +cd /usr/bin && +ln -sf vim 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 @@ -41,24 +41,21 @@ for their temporary state files, like temporary save files for example. If you wish vim to conform to the FHS, you should use this command set instead of the one presented above:</para> -<para><screen><userinput>sed '/shUntil\|link shRepeat/{</userinput> -<userinput> /shUntil/N</userinput> -<userinput> /^/i\</userinput> -<userinput> if exists("b:is_kornshell") || -exists("b:is_bash")</userinput> -<userinput> p</userinput> -<userinput> /$/i\</userinput> -<userinput> endif</userinput> -<userinput> d</userinput> -<userinput> }' runtime/syntax/sh.vim > sh.vim.fixed -&&</userinput> -<userinput>mv sh.vim.fixed runtime/syntax/sh.vim &&</userinput> -<userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &&</userinput> -<userinput>make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" -&&</userinput> -<userinput>make install &&</userinput> -<userinput>cd /usr/bin &&</userinput> -<userinput>ln -sf vim vi</userinput></screen></para> +<para><screen><userinput>sed '/shUntil\|link shRepeat/{ + /shUntil/N + /^/i\ + if exists("b:is_kornshell") || exists("b:is_bash") + p + /$/i\ + endif + d + }' runtime/syntax/sh.vim > sh.vim.fixed && +mv sh.vim.fixed runtime/syntax/sh.vim && +./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> </sect2> |