Browse Source

Misc fixes from Fernando

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9999 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Bruce Dubbs 13 years ago
parent
commit
f5976ac6b4
4 changed files with 21 additions and 14 deletions
  1. 1 1
      chapter06/e2fsprogs.xml
  2. 4 1
      chapter06/flex.xml
  3. 15 11
      chapter06/ncurses.xml
  4. 1 1
      chapter07/network.xml

+ 1 - 1
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
     <para>If desired, create and install some additional documentation by
     issuing the following commands:</para>
     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 -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>
 install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userinput></screen>
   </sect2>
   </sect2>

+ 4 - 1
chapter06/flex.xml

@@ -47,7 +47,10 @@
 
 
     <para>Prepare Flex for compilation:</para>
     <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>
     <para>Compile the package:</para>
 
 

+ 15 - 11
chapter06/ncurses.xml

@@ -53,8 +53,11 @@
 
 
     <para>Prepare Ncurses for compilation:</para>
     <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>
     <variablelist>
       <title>The meaning of the configure option:</title>
       <title>The meaning of the configure option:</title>
@@ -115,22 +118,23 @@
     non-wide-character Ncurses libraries. Trick such applications into linking with
     non-wide-character Ncurses libraries. Trick such applications into linking with
     wide-character libraries by means of symlinks and linker scripts:</para>
     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
 done
+
 ln -sfv libncurses++w.a /usr/lib/libncurses++.a</userinput></screen>
 ln -sfv libncurses++w.a /usr/lib/libncurses++.a</userinput></screen>
 
 
     <para>Finally, make sure that old applications that look for
     <para>Finally, make sure that old applications that look for
     <filename class="libraryfile">-lcurses</filename> at build time are still
     <filename class="libraryfile">-lcurses</filename> at build time are still
     buildable:</para>
     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>
     <para>If desired, install the Ncurses documentation:</para>
 
 

+ 1 - 1
chapter07/network.xml

@@ -50,7 +50,7 @@
 <screen role="nodump"><userinput>cat /etc/udev/rules.d/70-persistent-net.rules</userinput></screen>
 <screen role="nodump"><userinput>cat /etc/udev/rules.d/70-persistent-net.rules</userinput></screen>
 
 
     <note><para>In some cases such as when MAC addresess have been assigned to
     <note><para>In some cases such as when MAC addresess have been assigned to
-    a network card manually or in a virtual envirnment such as Xen,
+    a network card manually or in a virtual environment such as Xen,
     the network rules file may not have been generated because addresses 
     the network rules file may not have been generated because addresses 
     are not consistently assigned.  In these cases, just continue to
     are not consistently assigned.  In these cases, just continue to
     the next section.</para></note>
     the next section.</para></note>