aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hymers <markh@linuxfromscratch.org>2001-12-10 16:40:26 +0000
committerMark Hymers <markh@linuxfromscratch.org>2001-12-10 16:40:26 +0000
commit60fd3bbd6fa6b598eb54deda2b7e245c77024aef (patch)
tree7e9eee26190c1aa659f87c19b7ca919d9dc347c1
parent8c5e7152f076d6b68a23e6629a44b49763557f48 (diff)
[Bug 150] Re-create /bin/sh symlink in chapter 6 + similar things
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1371 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter06/bash-inst.xml2
-rw-r--r--chapter06/fileutils-inst.xml4
-rw-r--r--chapter06/gcc-inst.xml8
4 files changed, 16 insertions, 2 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c1a573dc5..1cdbce555 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -6,6 +6,10 @@
<itemizedlist>
+<listitem><para>December 10th, 2001 [markh]: Chapter 6: Re-create
+symlinks in bash, fileutils and gcc instructions to make the Chapter 6
+instructions independent of those in chapter 5.</para></listitem>
+
<listitem><para>December 10th, 2001 [marcheerdink]: Chapter 5+6: Cleaned
up the sed commands to use the backup file that was created earlier instead
of writing to an intermediate 'tmp~' file.</para></listitem>
diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml
index 0e113e9e9..08c522099 100644
--- a/chapter06/bash-inst.xml
+++ b/chapter06/bash-inst.xml
@@ -7,6 +7,8 @@
&nbsp;&nbsp;&nbsp;--bindir=/bin &amp;&amp;
make &amp;&amp;
make install &amp;&amp;
+cd /bin &amp;&amp;
+ln -sf bash sh &amp;&amp;
exec /bin/bash --login</userinput></screen></para>
</sect2>
diff --git a/chapter06/fileutils-inst.xml b/chapter06/fileutils-inst.xml
index 8cfabe762..4e7ad9327 100644
--- a/chapter06/fileutils-inst.xml
+++ b/chapter06/fileutils-inst.xml
@@ -6,7 +6,9 @@
<para><screen><userinput>./configure --prefix=/usr --bindir=/bin \
&nbsp;&nbsp;&nbsp;--libexecdir=/bin &amp;&amp;
make &amp;&amp;
-make install</userinput></screen></para>
+make install &amp;&amp;
+cd /usr/bin &amp;&amp;
+ln -sf ../../bin/install</userinput></screen></para>
</sect2>
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index f9510506f..5e86705cc 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -23,7 +23,13 @@ cd ../gcc-build &amp;&amp;
../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
&nbsp;&nbsp;&nbsp;--enable-languages=c,c++ --enable-threads=posix &amp;&amp;
make bootstrap &amp;&amp;
-make install</userinput></screen></para>
+make install &amp;&amp;
+cd /lib &amp;&amp;
+ln -sf ../usr/bin/cpp &amp;&amp;
+cd /usr/lib &amp;&amp;
+ln -sf ../bin/cpp &amp;&amp;
+cd /usr/bin &amp;&amp;
+ln -sf gcc cc</userinput></screen></para>
</sect2>