Changed ln -sf to ln -s where possible, cp libiberty.h after binutils install, remove groups program from Shadow, re-added the sh-utils-2.0.patch.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2061 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

11 files changed, 34 insertions, 23 deletions

diff --git a/chapter06/binutils-exp.xml b/chapter06/binutils-exp.xml
index 7581ca2d2..7e8711e2c 100644
--- a/chapter06/binutils-exp.xml
+++ b/chapter06/binutils-exp.xml
@@ -13,5 +13,9 @@ executed on Apple PowerPC machines).</para>
 <para><userinput>make tooldir=/usr install-info:</userinput> This will
 install binutils' info pages.</para>
 
+<para><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /usr/include:</userinput>
+The libiberty.h header file is needed in order for certain software to
+compile.</para>
+
 </sect2>
 
diff --git a/chapter06/binutils-inst.xml b/chapter06/binutils-inst.xml
index 48a2778d0..970d734cf 100644
--- a/chapter06/binutils-inst.xml
+++ b/chapter06/binutils-inst.xml
@@ -14,7 +14,8 @@ cd ../binutils-build &amp;&amp;
 ../binutils-&binutils-version;/configure --prefix=/usr --enable-shared &amp;&amp;
 make tooldir=/usr &amp;&amp;
 make tooldir=/usr install &amp;&amp;
-make tooldir=/usr install-info</userinput></screen></para>
+make tooldir=/usr install-info &amp;&amp;
+cp ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml
index 33d6b1dcd..97297157d 100644
--- a/chapter06/bzip2-inst.xml
+++ b/chapter06/bzip2-inst.xml
@@ -9,11 +9,11 @@ make PREFIX=/usr install &amp;&amp;
 cp bzip2-shared /bin/bzip2 &amp;&amp;
 ln -s libbz2.so.1.0 libbz2.so &amp;&amp;
 cp -a libbz2.so* /lib &amp;&amp;
-ln -sf ../../lib/libbz2.so /usr/lib &amp;&amp;
+ln -s ../../lib/libbz2.so /usr/lib &amp;&amp;
 rm /usr/bin/{bunzip2,bzcat,bzip2} &amp;&amp;
 mv /usr/bin/{bzip2recover,bzless,bzmore} /bin &amp;&amp;
-ln -sf bzip2 /bin/bunzip2 &amp;&amp;
-ln -sf bzip2 /bin/bzcat</userinput></screen></para>
+ln -s bzip2 /bin/bunzip2 &amp;&amp;
+ln -s bzip2 /bin/bzcat</userinput></screen></para>
 
 
 <para>Although it's not strictly a part of a basic LFS system it's worth
diff --git a/chapter06/fileutils-inst.xml b/chapter06/fileutils-inst.xml
index b3f70ee81..79ca45d1d 100644
--- a/chapter06/fileutils-inst.xml
+++ b/chapter06/fileutils-inst.xml
@@ -6,7 +6,7 @@
 <para><screen><userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
-ln -sf ../../bin/install /usr/bin</userinput></screen></para>
+ln -s ../../bin/install /usr/bin</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index 47c075180..ae56e55c7 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -25,9 +25,9 @@ cd ../gcc-build &amp;&amp;
 &nbsp;&nbsp;&nbsp;&nbsp;--with-slibdir=/lib &amp;&amp;
 make bootstrap &amp;&amp;
 make install &amp;&amp;
-ln -sf ../usr/bin/cpp /lib &amp;&amp;
-ln -sf ../bin/cpp /usr/lib &amp;&amp;
-ln -sf gcc /usr/bin/cc</userinput></screen></para>
+ln -s ../usr/bin/cpp /lib &amp;&amp;
+ln -s ../bin/cpp /usr/lib &amp;&amp;
+ln -s gcc /usr/bin/cc</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml
index 7782d1f05..30581ad63 100644
--- a/chapter06/gzip-inst.xml
+++ b/chapter06/gzip-inst.xml
@@ -10,9 +10,9 @@ make &amp;&amp;
 make install &amp;&amp;
 mv /usr/bin/gzip /bin &amp;&amp;
 rm /usr/bin/{gunzip,zcat} &amp;&amp;
-ln -sf gzip /bin/gunzip &amp;&amp;
-ln -sf gzip /bin/zcat &amp;&amp;
-ln -sf gunzip /bin/uncompress</userinput></screen></para>
+ln -s gzip /bin/gunzip &amp;&amp;
+ln -s gzip /bin/zcat &amp;&amp;
+ln -s gunzip /bin/uncompress</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml
index a6adcb92d..97890fbe1 100644
--- a/chapter06/ncurses-inst.xml
+++ b/chapter06/ncurses-inst.xml
@@ -13,11 +13,11 @@ make &amp;&amp;
 make install &amp;&amp;
 mv /lib/*.a /usr/lib &amp;&amp;
 chmod 755 /lib/*.5.2 &amp;&amp;
-ln -sf libncurses.a /usr/lib/libcurses.a &amp;&amp;
-ln -sf ../../lib/libncurses.so /usr/lib &amp;&amp;
-ln -sf ../../lib/libcurses.so /usr/lib &amp;&amp;
-ln -sf ../../lib/libform.so /usr/lib &amp;&amp;
-ln -sf ../../lib/libpanel.so /usr/lib &amp;&amp;
-ln -sf ../../lib/libmenu.so /usr/lib</userinput></screen></para>
+ln -s libncurses.a /usr/lib/libcurses.a &amp;&amp;
+ln -s ../../lib/libncurses.so /usr/lib &amp;&amp;
+ln -s ../../lib/libcurses.so /usr/lib &amp;&amp;
+ln -s ../../lib/libform.so /usr/lib &amp;&amp;
+ln -s ../../lib/libpanel.so /usr/lib &amp;&amp;
+ln -s ../../lib/libmenu.so /usr/lib</userinput></screen></para>
 </sect2>
 
diff --git a/chapter06/shadowpwd-exp.xml b/chapter06/shadowpwd-exp.xml
index 2ab8ca54d..5c76e3592 100644
--- a/chapter06/shadowpwd-exp.xml
+++ b/chapter06/shadowpwd-exp.xml
@@ -10,7 +10,7 @@ details on the system.</para>
 /etc/login.defs</userinput>: /var/spool/mail is the old location of the
 user mailboxes. The location that is used nowadays is /var/mail.</para>
 
-<para><userinput>ln -sf vipw vigr</userinput>: According to the manpage of
+<para><userinput>ln -s vipw vigr:</userinput> According to the manpage of
 vipw, vigr should be a symlink to it. Because the shadow installation
 procedure doesn't create these symlinks, we create them manually.</para>
 
diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index 0f02f23cc..17a3f365d 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -16,11 +16,17 @@ make install &amp;&amp;
 cp etc/{limits,login.access} /etc &amp;&amp;
 sed 's%/var/spool/mail%/var/mail%' \
 &nbsp;&nbsp;&nbsp;&nbsp;etc/login.defs.linux &gt; /etc/login.defs &amp;&amp;
-ln -sf vipw /usr/sbin/vigr &amp;&amp;
+ln -s vipw /usr/sbin/vigr &amp;&amp;
 rm /bin/vipw &amp;&amp;
 mv /bin/sg /usr/bin &amp;&amp;
 mv /lib/{libmisc.*a,libshadow.*a} /usr/lib &amp;&amp;
 ln -s ../../lib/libshadow.so /usr/lib</userinput></screen></para>
 
-</sect2>
+<para>Sh-utils and Shadow Password Suite each install a unique
+<filename>groups</filename> program. If you wish, you may remove the
+<filename>groups</filename> program installed by the Shadow Password
+Suite by running the following command:</para>
+
+<para><screen><userinput>rm /bin/groups</userinput></screen></para>
 
+</sect2>
diff --git a/chapter06/shellutils-inst.xml b/chapter06/shellutils-inst.xml
index 24cf497d7..9c7cee0b9 100644
--- a/chapter06/shellutils-inst.xml
+++ b/chapter06/shellutils-inst.xml
@@ -21,7 +21,7 @@ encountered in the form of <command>[ condition ]</command>. These brackets
 are built into the bash interpreter, but the FHS dictates that there should be a
 <filename>[</filename> binary. Create it by running:</para>
 
-<para><screen><userinput>ln -sf test /bin/[</userinput></screen></para>
+<para><screen><userinput>ln -s test /bin/[</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml
index c5476647e..31fc04fad 100644
--- a/chapter06/vim-inst.xml
+++ b/chapter06/vim-inst.xml
@@ -16,7 +16,7 @@ Currently, there are instructions for Emacs, nano, and joe.</para>
 ./configure --prefix=/usr &amp;&amp;
 make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
 make install &amp;&amp;
-ln -sf vim /usr/bin/vi</userinput></screen></para>
+ln -s vim /usr/bin/vi</userinput></screen></para>
 
 <para>If you plan to install the X Window system on your LFS
 system, you might want to re-compile Vim after you have installed X. Vim
@@ -38,7 +38,7 @@ instead of the one presented above:</para>
 ./configure --prefix=/usr --localstatedir=/var/lib/vim &amp;&amp;
 make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
 make install &amp;&amp;
-ln -sf vim /usr/bin/vi</userinput></screen></para>
+ln -s vim /usr/bin/vi</userinput></screen></para>
 
 </sect2>