aboutsummaryrefslogtreecommitdiffstats
path: root/prologue
diff options
context:
space:
mode:
Diffstat (limited to 'prologue')
-rw-r--r--prologue/architecture.xml2
-rw-r--r--prologue/hostreqs.xml28
2 files changed, 17 insertions, 13 deletions
diff --git a/prologue/architecture.xml b/prologue/architecture.xml
index af08bc054..84bcc3bb7 100644
--- a/prologue/architecture.xml
+++ b/prologue/architecture.xml
@@ -41,7 +41,7 @@ data that exceeds 4GB, the advantages of a 64-bit system are substantial.</para>
32-bit system and once for a 64-bit system. This is not directly supported in
LFS because it would interfere with the educational objective of providing the
instructions needed for a straightforward base Linux system. You can refer to
-the <ulink url="http://trac.cross-lfs.org/">Cross Linux From Scratch</ulink>
+the <ulink url="http://trac.clfs.org/">Cross Linux From Scratch</ulink>
project for this advanced topic.</para>
<para>There is one last comment about 64-bit systems. There are some older
diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml
index 1ce491d66..3733ae5ad 100644
--- a/prologue/hostreqs.xml
+++ b/prologue/hostreqs.xml
@@ -163,18 +163,28 @@ bash --version | head -n1 | cut -d" " -f2-4
echo "/bin/sh -&gt; `readlink -f /bin/sh`"
echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
bison --version | head -n1
-if [ -e /usr/bin/yacc ];
- then echo "/usr/bin/yacc -&gt; `readlink -f /usr/bin/yacc`";
- else echo "yacc not found"; fi
+
+if [ -h /usr/bin/yacc ]; then
+ echo "/usr/bin/yacc -> `readlink -f /usr/bin/yacc`";
+elif [ -x /usr/bin/yacc ]; then
+ echo yacc is `/usr/bin/yacc --version | head -n1`
+else
+ echo "yacc not found"
+fi
bzip2 --version 2&gt;&amp;1 &lt; /dev/null | head -n1 | cut -d" " -f1,6-
echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
diff --version | head -n1
find --version | head -n1
gawk --version | head -n1
-if [ -e /usr/bin/awk ];
- then echo "/usr/bin/awk -&gt; `readlink -f /usr/bin/awk`";
- else echo "awk not found"; fi
+
+if [ -h /usr/bin/awk ]; then
+ echo "/usr/bin/awk -&gt; `readlink -f /usr/bin/awk`";
+elif [ -x /usr/bin/awk ]; then
+ echo yacc is `/usr/bin/awk --version | head -n1`
+else
+ echo "awk not found"
+fi
gcc --version | head -n1
g++ --version | head -n1
@@ -195,12 +205,6 @@ if [ -x dummy ]
then echo "g++ compilation OK";
else echo "g++ compilation failed"; fi
rm -f dummy.c dummy</literal>
-<!--
-for lib in lib{gmp,mpfr,mpc}.la; do
- echo $lib: $(if find /usr/lib* -name $lib|
- grep -q $lib;then :;else echo not;fi) found
-done
-unset lib</literal>-->
EOF
bash version-check.sh</userinput></screen>