aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2012-09-27 02:36:20 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2012-09-27 02:36:20 +0000
commitf5976ac6b48ecc79d06126dbeb35d8e88174e678 (patch)
tree577ed06aa80992f08e400e2f928ae16514def8ee /chapter06
parent14377f4ac060f66ca3f7c55388d148428fa401d3 (diff)
Misc fixes from Fernando
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9999 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/e2fsprogs.xml2
-rw-r--r--chapter06/flex.xml5
-rw-r--r--chapter06/ncurses.xml26
3 files changed, 20 insertions, 13 deletions
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 472740379..514035eb6 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -147,7 +147,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/libext2fs.info</user
<para>If desired, create and install some additional documentation by
issuing the following commands:</para>
-<screen><userinput remap="install">makeinfo -o doc/com_err.info ../lib/et/com_err.texinfo
+<screen><userinput remap="install">makeinfo -o doc/com_err.info lib/et/com_err.texinfo
install -v -m644 doc/com_err.info /usr/share/info
install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userinput></screen>
</sect2>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index b1feaf6cd..f12261235 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -47,7 +47,10 @@
<para>Prepare Flex for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
<para>Compile the package:</para>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index d3da0d7bd..4a78fa7fa 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -53,8 +53,11 @@
<para>Prepare Ncurses for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr --mandir=/usr/share/man --with-shared \
- --without-debug --enable-widec</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --with-shared \
+ --without-debug \
+ --enable-widec</userinput></screen>
<variablelist>
<title>The meaning of the configure option:</title>
@@ -115,22 +118,23 @@
non-wide-character Ncurses libraries. Trick such applications into linking with
wide-character libraries by means of symlinks and linker scripts:</para>
-<screen><userinput remap="install">for lib in ncurses form panel menu ; do \
- rm -vf /usr/lib/lib${lib}.so ; \
- echo "INPUT(-l${lib}w)" &gt;/usr/lib/lib${lib}.so ; \
- ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a ; \
+<screen><userinput remap="install">for lib in ncurses form panel menu ; do
+ rm -vf /usr/lib/lib${lib}.so
+ echo "INPUT(-l${lib}w)" &gt;/usr/lib/lib${lib}.so
+ ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
done
+
ln -sfv libncurses++w.a /usr/lib/libncurses++.a</userinput></screen>
<para>Finally, make sure that old applications that look for
<filename class="libraryfile">-lcurses</filename> at build time are still
buildable:</para>
-<screen><userinput remap="install">rm -vf /usr/lib/libcursesw.so
-echo "INPUT(-lncursesw)" &gt;/usr/lib/libcursesw.so
-ln -sfv libncurses.so /usr/lib/libcurses.so
-ln -sfv libncursesw.a /usr/lib/libcursesw.a
-ln -sfv libncurses.a /usr/lib/libcurses.a</userinput></screen>
+<screen><userinput remap="install">rm -vf /usr/lib/libcursesw.so
+echo "INPUT(-lncursesw)" &gt; /usr/lib/libcursesw.so
+ln -sfv libncurses.so /usr/lib/libcurses.so
+ln -sfv libncursesw.a /usr/lib/libcursesw.a
+ln -sfv libncurses.a /usr/lib/libcurses.a</userinput></screen>
<para>If desired, install the Ncurses documentation:</para>