r1733 - in branches/clfs-2.0/BOOK: final-preps final-system/common

jciccone at linuxfromscratch.org jciccone at linuxfromscratch.org
Tue Jun 6 12:54:27 PDT 2006


Author: jciccone
Date: 2006-06-06 13:54:26 -0600 (Tue, 06 Jun 2006)
New Revision: 1733

Modified:
   branches/clfs-2.0/BOOK/final-preps/creatingdirs.xml
   branches/clfs-2.0/BOOK/final-system/common/gzip.xml
   branches/clfs-2.0/BOOK/final-system/common/kbd.xml
   branches/clfs-2.0/BOOK/final-system/common/less.xml
   branches/clfs-2.0/BOOK/final-system/common/procps.xml
   branches/clfs-2.0/BOOK/final-system/common/zlib.xml
Log:
Fixed a few typos.

Modified: branches/clfs-2.0/BOOK/final-preps/creatingdirs.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-preps/creatingdirs.xml	2006-06-06 05:54:28 UTC (rev 1732)
+++ branches/clfs-2.0/BOOK/final-preps/creatingdirs.xml	2006-06-06 19:54:26 UTC (rev 1733)
@@ -13,8 +13,8 @@
   <para>It is time to create some structure in the LFS file system. Create a
   standard directory tree by issuing the following commands:</para>
 
-<screen><userinput>mkdir -pv ${LFS}/{bin,boot,etc/opt,home,lib,mnt,opt}
-mkdir -pv ${LFS}/{media/{floppy,cdrom},sbin,srv,var}
+<screen><userinput>mkdir -pv ${LFS}/{bin,boot,dev,etc/opt,home,lib,mnt,opt}
+mkdir -pv ${LFS}/{proc,media/{floppy,cdrom},sbin,srv,sys,var}
 install -dv -m 0750 ${LFS}/root
 install -dv -m 1777 ${LFS}/tmp ${LFS}/var/tmp
 mkdir -pv ${LFS}/usr/{,local/}{bin,include,lib,sbin,src}

Modified: branches/clfs-2.0/BOOK/final-system/common/gzip.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-system/common/gzip.xml	2006-06-06 05:54:28 UTC (rev 1732)
+++ branches/clfs-2.0/BOOK/final-system/common/gzip.xml	2006-06-06 19:54:26 UTC (rev 1733)
@@ -41,8 +41,8 @@
     location of the binary is changed later, the following command ensures
     that the new location gets placed into the script:</para>
 
-<screen os="d"><userinput>cp gzexec.in{,.orig}
-sed 's@"BINDIR"@/bin at g' gzexe.in.orig > gzexec.in</userinput></screen>
+<screen os="d"><userinput>cp gzexe.in{,.orig}
+sed 's@"BINDIR"@/bin at g' gzexe.in.orig > gzexe.in</userinput></screen>
 
     <para os="e">Compile the package:</para>
 

Modified: branches/clfs-2.0/BOOK/final-system/common/kbd.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-system/common/kbd.xml	2006-06-06 05:54:28 UTC (rev 1732)
+++ branches/clfs-2.0/BOOK/final-system/common/kbd.xml	2006-06-06 19:54:26 UTC (rev 1733)
@@ -38,8 +38,8 @@
     <para os="s3">The following sed removes -s from the install command which
     will try to strip the installed files:</para>
 
-<screen os="s4"><userinput>cp src/Makefile{,.orig}
-sed -e "s/install -s/install/" src/Makefile.orig > src/Makefile</userinput></screen>
+<screen os="s4"><userinput>cp src/Makefile.in{,.orig}
+sed -e "s/install -s/install/" src/Makefile.in.orig > src/Makefile.in</userinput></screen>
 
     <para os="a">Prepare Kbd for compilation:</para>
 

Modified: branches/clfs-2.0/BOOK/final-system/common/less.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-system/common/less.xml	2006-06-06 05:54:28 UTC (rev 1732)
+++ branches/clfs-2.0/BOOK/final-system/common/less.xml	2006-06-06 19:54:26 UTC (rev 1733)
@@ -48,7 +48,7 @@
 
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make prefixR=${LFS}/usr install</userinput></screen>
+<screen os="g"><userinput>make prefix=${LFS}/usr install</userinput></screen>
 
     <para os="h">Move less to /bin:</para>
 

Modified: branches/clfs-2.0/BOOK/final-system/common/procps.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-system/common/procps.xml	2006-06-06 05:54:28 UTC (rev 1732)
+++ branches/clfs-2.0/BOOK/final-system/common/procps.xml	2006-06-06 19:54:26 UTC (rev 1733)
@@ -37,12 +37,10 @@
 
 <screen os="b"><userinput>make</userinput></screen>
 
-    <para os="c">This package does not come with a test suite.</para>
+    <para os="c">Install the package:</para>
 
-    <para os="d">Install the package:</para>
+<screen os="d"><userinput>make DESTDIR=${LFS} lib64=lib install</userinput></screen>
 
-<screen os="e"><userinput>make DESTDIR=${LFS} lib64=lib install</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-procps" role="content">

Modified: branches/clfs-2.0/BOOK/final-system/common/zlib.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-system/common/zlib.xml	2006-06-06 05:54:28 UTC (rev 1732)
+++ branches/clfs-2.0/BOOK/final-system/common/zlib.xml	2006-06-06 19:54:26 UTC (rev 1733)
@@ -30,18 +30,13 @@
 
 <screen os="p2"><userinput>patch -Np1 -i ../&zlib-fpic-patch;</userinput></screen>
 
-    <para os="s1">The following sed tells the Makefile to pass r to AR:</para>
-
-<screen os="s2"><userinput>cp Makefile.in{,.orig}
-sed 's/$(AR) $@/$(AR) r $@/' Makefile.in.orig > Makefile.in</userinput></screen>
-
     <para os="a">Prepare Zlib for compilation:</para>
 
 <screen os="b"><userinput>./configure --prefix=/usr --shared</userinput></screen>
 
     <para os="c">Compile the package:</para>
 
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="d"><userinput>make AR="${AR} rc"</userinput></screen>
 
     <para os="e">Install the pacakge:</para>
 




More information about the cross-lfs mailing list