[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-657-g906f724

git git at cross-lfs.org
Tue Apr 8 19:01:46 PDT 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, systemd has been updated
       via  906f724c28419a6465567fa94057cef558109f4f (commit)
       via  c87316537627f05b797be0e0ac3f62f3447049ef (commit)
       via  ce32b58d4d3f85ee76f2efbda2961c908bf8e091 (commit)
       via  8699cff053e028c4eb1a2685ceb269cea2ff48ef (commit)
       via  87ec28c1b91d1089e2069df0a0643edb6493bc00 (commit)
       via  b7448351d9224e246a576e31d3c53d8c9f6c9b77 (commit)
       via  42484773e56ac951a60b46d056158ef2ca492e26 (commit)
       via  4ff8077d092c811613f7e93d67efdf4c392285b1 (commit)
       via  d48889951ea2c6a1ea9aade529bd6dc964030b21 (commit)
      from  adab4c581042c2db7661e73da81ca02b60cb58a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 906f724c28419a6465567fa94057cef558109f4f
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Tue Apr 8 21:01:39 2014 -0500

    Remove link for installed documentation and install documentation into the proper place with HELPSUBLOC variable during make install.

diff --git a/BOOK/final-system/common/vim.xml b/BOOK/final-system/common/vim.xml
index 9a7a7e8..fc129bb 100644
--- a/BOOK/final-system/common/vim.xml
+++ b/BOOK/final-system/common/vim.xml
@@ -80,7 +80,7 @@
 
     <para os="j">Install the package:</para>
 
-<screen os="k"><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
 
     <para os="l">Many users are accustomed to using <command>vi</command>
     instead of <command>vim</command>. Some programs, such as
@@ -91,15 +91,7 @@
 
 <screen os="m"><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
 
-<para os="n">By default, Vim's documentation is installed in
-<filename class="directory">/usr/share/vim</filename>.  The following symlink
-allows the documentation to be accessed via
-<filename class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
-it consistent with the location of documentation for other packages:</para>
-
-<screen os="o"><userinput>ln -sv ../vim/vim&vim-version2;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
-
-    <para os="p">If an X Window System is going to be installed on the CLFS
+    <para os="n">If an X Window System is going to be installed on the CLFS
     system, you may want to recompile Vim after installing X. Vim
     comes with a GUI version of the editor that requires X and some
     additional libraries to be installed. For more information, refer to the
@@ -165,14 +157,14 @@ EOF</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk,
         pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl,
         tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
         vimdiff (link to vim), vimm, vimspell.sh, vimtutor, and xxd</seg>
-        <seg>/usr/share/vim</seg>
+        <seg>/usr/share/vim, /usr/share/doc/vim-&vim-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/BOOK/final-system/multilib/vim.xml b/BOOK/final-system/multilib/vim.xml
index 6cc7c32..20f60ae 100644
--- a/BOOK/final-system/multilib/vim.xml
+++ b/BOOK/final-system/multilib/vim.xml
@@ -93,14 +93,6 @@
     href="../common/vim.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

commit c87316537627f05b797be0e0ac3f62f3447049ef
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Tue Apr 8 21:00:20 2014 -0500

    Install documentation with versioned directory and add/update installed directories.

diff --git a/BOOK/final-system/common/automake.xml b/BOOK/final-system/common/automake.xml
index 2c8b1fe..d4a5d7d 100644
--- a/BOOK/final-system/common/automake.xml
+++ b/BOOK/final-system/common/automake.xml
@@ -27,7 +27,7 @@
 
     <para os="a">Prepare Automake for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
 
diff --git a/BOOK/final-system/common/dbus.xml b/BOOK/final-system/common/dbus.xml
index bda12fb..944c7f1 100644
--- a/BOOK/final-system/common/dbus.xml
+++ b/BOOK/final-system/common/dbus.xml
@@ -29,7 +29,8 @@
 
 <screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/dbus-1.0 --localstatedir=/var \
-    --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+    --with-systemdsystemunitdir=/lib/systemd/system \
+    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
 
@@ -69,7 +70,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
         <seg>dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor, dbus-send, dbus-uuidgen</seg>
         <seg>libdbus-1.[a,so]</seg>
         <seg>/etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0,
-        /var/lib/dbus</seg>
+        /usr/share/doc/dbus-&dbus-version;, /var/lib/dbus</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/BOOK/final-system/common/flex.xml b/BOOK/final-system/common/flex.xml
index de8a115..59f7087 100644
--- a/BOOK/final-system/common/flex.xml
+++ b/BOOK/final-system/common/flex.xml
@@ -27,7 +27,7 @@
 
     <para os="a">Prepare Flex for compilation:</para>
 
-<screen os="b"><userinput>M4=m4 ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>M4=m4 ./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
 
@@ -65,10 +65,12 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>flex, flex++, and lex</seg>
         <seg>libfl.[a,so] and libfl_pic.[a,so]</seg>
+        <seg>/usr/share/doc/flex-&flex-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/BOOK/final-system/common/gawk.xml b/BOOK/final-system/common/gawk.xml
index 73b89bc..e691846 100644
--- a/BOOK/final-system/common/gawk.xml
+++ b/BOOK/final-system/common/gawk.xml
@@ -41,6 +41,11 @@
 
 <screen os="g"><userinput>make install</userinput></screen>
 
+    <para os="h">Install the documentation:</para>
+
+<screen os="i"><userinput>mkdir -v /usr/share/doc/gawk-&gawk-version;
+cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-gawk" role="content">
@@ -53,7 +58,8 @@
       <seglistitem>
         <seg>awk (link to gawk), gawk, gawk-&gawk-version;, grcat, igawk,
         pgawk, pgawk-&gawk-version;, and pwcat</seg>
-        <seg>/usr/lib/awk, /usr/lib/gawk, /usr/share/awk</seg>
+        <seg>/usr/lib/awk, /usr/lib/gawk, /usr/share/awk,
+        /usr/share/doc/gawk-&gawk-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/BOOK/final-system/common/gettext.xml b/BOOK/final-system/common/gettext.xml
index 8a1cfb5..e1d6bab 100644
--- a/BOOK/final-system/common/gettext.xml
+++ b/BOOK/final-system/common/gettext.xml
@@ -29,7 +29,7 @@
 
     <para os="a">Prepare Gettext for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
 
@@ -60,7 +60,8 @@
         msgunfmt, msguniq, ngettext, recode-sr-latin, and xgettext</seg>
         <seg>libasprintf.[a,so], libgettextlib.so, libgettextpo.[a,so],
         libgettextsrc.so, and preloadable_libintl.so</seg>
-        <seg>/usr/lib/gettext, /usr/share/doc/gettext, /usr/share/gettext</seg>
+        <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
+        /usr/share/gettext</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/BOOK/final-system/common/gmp.xml b/BOOK/final-system/common/gmp.xml
index 778eb94..32a5937 100644
--- a/BOOK/final-system/common/gmp.xml
+++ b/BOOK/final-system/common/gmp.xml
@@ -69,6 +69,12 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
 
 <screen os="i"><userinput>make install</userinput></screen>
 
+    <para os="j">Install the documentation:</para>
+
+<screen os="k"><userinput>mkdir -v /usr/share/doc/gmp-&gmp-version;
+cp -v doc/{isa_abi_headache,configuration} doc/*.html \
+    /usr/share/doc/gmp-&gmp-version;</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-gmp" role="content">
@@ -76,9 +82,11 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
 
     <segmentedlist>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>libgmp.[a,so], libgmpxx.[a,so]</seg>
+        <seg>/usr/share/doc/gmp-&gmp-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/BOOK/final-system/common/iproute2.xml b/BOOK/final-system/common/iproute2.xml
index 16a1184..cef350f 100644
--- a/BOOK/final-system/common/iproute2.xml
+++ b/BOOK/final-system/common/iproute2.xml
@@ -43,7 +43,8 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
 
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
+<screen os="b"><userinput>make DESTDIR= \
+    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
     MANDIR=/usr/share/man</userinput></screen>
 
     <variablelist os="c">
@@ -91,7 +92,8 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
         <seg>bridge, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
         and tc</seg>
-        <seg>/etc/iproute2, /usr/lib/tc, /usr/share/doc/iproute2</seg>
+        <seg>/etc/iproute2, /usr/lib/tc,
+        /usr/share/doc/iproute2-&iproute2-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/BOOK/final-system/common/kbd.xml b/BOOK/final-system/common/kbd.xml
index 09e1993..dc9f09d 100644
--- a/BOOK/final-system/common/kbd.xml
+++ b/BOOK/final-system/common/kbd.xml
@@ -46,6 +46,11 @@
 
 <screen os="i"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
 
+    <para os="j">Install the documentation:</para>
+
+<screen os="k"><userinput>mkdir -v /usr/share/doc/kbd-&kbd-version;
+cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-kbd" role="content">
@@ -63,6 +68,7 @@
         setleds, setmetamode, setvtrgb, showconsolefont, showkey,
         unicode_start, and unicode_stop</seg>
         <seg>/usr/share/consolefonts, /usr/share/consoletrans,
+        /usr/share/doc/kbd-&kbd-version;,
         /usr/share/keymaps, /usr/share/unimaps</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/BOOK/final-system/common/mpfr.xml b/BOOK/final-system/common/mpfr.xml
index d10e63b..be5aea5 100644
--- a/BOOK/final-system/common/mpfr.xml
+++ b/BOOK/final-system/common/mpfr.xml
@@ -33,7 +33,8 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ./configure --prefix=/usr --with-gmp=/usr</userinput></screen>
+  ./configure --prefix=/usr --with-gmp=/usr
+  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
 
@@ -63,7 +64,7 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
 
       <seglistitem>
         <seg>libmpfr.[a,so]</seg>
-        <seg>/usr/share/doc/mpfr</seg>
+        <seg>/usr/share/doc/mpfr-&mpfr-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/BOOK/final-system/common/readline.xml b/BOOK/final-system/common/readline.xml
index 991a79c..f6c3fe0 100644
--- a/BOOK/final-system/common/readline.xml
+++ b/BOOK/final-system/common/readline.xml
@@ -42,7 +42,7 @@
 
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make htmldir=/usr/share/doc/readline install</userinput></screen>
+<screen os="g"><userinput>make htmldir=/usr/share/doc/readline-&readline-version; install</userinput></screen>
 
     <para os="h">Now move the static libraries to a more appropriate location:</para>
 
@@ -65,7 +65,7 @@ rm -v /lib/lib{readline,history}.so</userinput></screen>
 
       <seglistitem>
         <seg>libhistory.[a,so], and libreadline.[a,so]</seg>
-        <seg>/usr/include/readline, /usr/share/doc/readline, /usr/share/readline</seg>
+        <seg>/usr/include/readline, /usr/share/doc/readline-&readline-version;, /usr/share/readline</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/BOOK/final-system/common/sed.xml b/BOOK/final-system/common/sed.xml
index 1d4c0f7..d409e9a 100644
--- a/BOOK/final-system/common/sed.xml
+++ b/BOOK/final-system/common/sed.xml
@@ -26,7 +26,8 @@
 
     <para os="a">Prepare Sed for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
+    --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
 
@@ -59,7 +60,7 @@
 
       <seglistitem>
         <seg>sed</seg>
-        <seg>/usr/share/doc/sed</seg>
+        <seg>/usr/share/doc/sed-&sed-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/BOOK/final-system/common/tar.xml b/BOOK/final-system/common/tar.xml
index e49137e..9745af9 100644
--- a/BOOK/final-system/common/tar.xml
+++ b/BOOK/final-system/common/tar.xml
@@ -50,6 +50,10 @@
 
 <screen os="i"><userinput>perl tarman > /usr/share/man/man1/tar.1</userinput></screen>
 
+    <para os="j">Install the documentation:</para>
+
+<screen os="k"><userinput>make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-tar" role="content">
@@ -57,9 +61,11 @@
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>rmt and tar</seg>
+        <seg>/usr/share/doc/tar-&tar-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/BOOK/final-system/common/util-linux.xml b/BOOK/final-system/common/util-linux.xml
index 27f9ad4..e09efc4 100644
--- a/BOOK/final-system/common/util-linux.xml
+++ b/BOOK/final-system/common/util-linux.xml
@@ -50,7 +50,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
 
     <para os="a">Prepare Util-linux for compilation:</para>
 
-<screen os="b"><userinput>./configure --enable-write</userinput></screen>
+<screen os="b"><userinput>./configure --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <variablelist os="c">
       <title>The meaning of the configure options:</title>
@@ -103,7 +103,8 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
         utmpdump, uuidd, uuidgen, wall, wdctl, whereis, wipefs, and write</seg>
         <seg>libblkid.[a,so], libmount.[a,so], and libuuid.[a,so]</seg>
         <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
-        /usr/share/bash-completion, /usr/share/doc/util-linux/getopt,
+        /usr/share/bash-completion,
+        /usr/share/doc/util-linux-&util-linux-version;/getopt,
         /var/lib/hwclock</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/BOOK/final-system/common/xz.xml b/BOOK/final-system/common/xz.xml
index 295e008..7efd824 100644
--- a/BOOK/final-system/common/xz.xml
+++ b/BOOK/final-system/common/xz.xml
@@ -29,7 +29,7 @@
 
     <para os="a">Prepare XZ Utils for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
 
@@ -73,7 +73,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/liblzma.so) /usr/lib/liblzma.so</userinput
         xzegrep (link to xzgrep), xzfgrep (link to xzgrep), xzgrep, xzless,
         and xzmore</seg>
         <seg>liblzma.[a,so]</seg>
-        <seg>/usr/include/lzma, /usr/share/doc/xz</seg>
+        <seg>/usr/include/lzma, /usr/share/doc/xz-&xz-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/BOOK/final-system/multilib/automake.xml b/BOOK/final-system/multilib/automake.xml
index 5bc0000..1b93125 100644
--- a/BOOK/final-system/multilib/automake.xml
+++ b/BOOK/final-system/multilib/automake.xml
@@ -25,7 +25,8 @@
     href="../common/automake.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/autoconf.xml"
diff --git a/BOOK/final-system/multilib/dbus-64bit.xml b/BOOK/final-system/multilib/dbus-64bit.xml
index f598ddd..a2c551e 100644
--- a/BOOK/final-system/multilib/dbus-64bit.xml
+++ b/BOOK/final-system/multilib/dbus-64bit.xml
@@ -28,7 +28,8 @@
 <screen os="b"><userinput>CC="gcc ${BUILD64}" USE_ARCH=64 \
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libdir=/usr/lib64 --libexecdir=/usr/lib64/dbus-1.0 \
-    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system
+    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/dbus.xml"
diff --git a/BOOK/final-system/multilib/dbus-n32.xml b/BOOK/final-system/multilib/dbus-n32.xml
index a64d5ae..11ba64f 100644
--- a/BOOK/final-system/multilib/dbus-n32.xml
+++ b/BOOK/final-system/multilib/dbus-n32.xml
@@ -28,7 +28,8 @@
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" USE_ARCH=n32 \
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libdir=/usr/lib32 --libexecdir=/usr/lib32/dbus-1.0 \
-    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system \
+    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/dbus.xml"
diff --git a/BOOK/final-system/multilib/dbus.xml b/BOOK/final-system/multilib/dbus.xml
index 15104dc..8aaedaf 100644
--- a/BOOK/final-system/multilib/dbus.xml
+++ b/BOOK/final-system/multilib/dbus.xml
@@ -28,7 +28,8 @@
 <screen os="b"><userinput>CC="gcc ${BUILD32}" USE_ARCH=32 \
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libdir=/usr/lib --libexecdir=/usr/lib/dbus-1.0 \
-    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system \
+    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/dbus.xml"
diff --git a/BOOK/final-system/multilib/flex-64bit.xml b/BOOK/final-system/multilib/flex-64bit.xml
index 0c95d77..8cd6075 100644
--- a/BOOK/final-system/multilib/flex-64bit.xml
+++ b/BOOK/final-system/multilib/flex-64bit.xml
@@ -26,7 +26,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" M4=m4 ./configure --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
+    --libdir=/usr/lib64 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="flex.xml"
diff --git a/BOOK/final-system/multilib/flex-n32.xml b/BOOK/final-system/multilib/flex-n32.xml
index eba31de..fed29ae 100644
--- a/BOOK/final-system/multilib/flex-n32.xml
+++ b/BOOK/final-system/multilib/flex-n32.xml
@@ -26,7 +26,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" M4=m4 ./configure --prefix=/usr \
-   --libdir=/usr/lib32</userinput></screen>
+   --libdir=/usr/lib32 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="flex.xml"
diff --git a/BOOK/final-system/multilib/flex.xml b/BOOK/final-system/multilib/flex.xml
index 4e1db32..c0d300f 100644
--- a/BOOK/final-system/multilib/flex.xml
+++ b/BOOK/final-system/multilib/flex.xml
@@ -26,7 +26,8 @@
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" M4=m4 ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" M4=m4 ./configure --prefix=/usr \
+    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/flex.xml"
diff --git a/BOOK/final-system/multilib/gawk.xml b/BOOK/final-system/multilib/gawk.xml
index 5f4d4d6..2538211 100644
--- a/BOOK/final-system/multilib/gawk.xml
+++ b/BOOK/final-system/multilib/gawk.xml
@@ -52,6 +52,14 @@
     href="../common/gawk.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/gettext-64bit.xml b/BOOK/final-system/multilib/gettext-64bit.xml
index 0355286..d61839a 100644
--- a/BOOK/final-system/multilib/gettext-64bit.xml
+++ b/BOOK/final-system/multilib/gettext-64bit.xml
@@ -26,7 +26,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-   ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+   ./configure --prefix=/usr --libdir=/usr/lib64 \
+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gettext.xml"
diff --git a/BOOK/final-system/multilib/gettext-n32.xml b/BOOK/final-system/multilib/gettext-n32.xml
index 9e64156..aa924de 100644
--- a/BOOK/final-system/multilib/gettext-n32.xml
+++ b/BOOK/final-system/multilib/gettext-n32.xml
@@ -27,7 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-   ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+   ./configure --prefix=/usr --libdir=/usr/lib32 \
+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gettext.xml"
diff --git a/BOOK/final-system/multilib/gettext.xml b/BOOK/final-system/multilib/gettext.xml
index a965ff7..1ddb2f4 100644
--- a/BOOK/final-system/multilib/gettext.xml
+++ b/BOOK/final-system/multilib/gettext.xml
@@ -27,7 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-   ./configure --prefix=/usr</userinput></screen>
+   ./configure --prefix=/usr \
+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gettext.xml"
diff --git a/BOOK/final-system/multilib/gmp-64bit.xml b/BOOK/final-system/multilib/gmp-64bit.xml
index f4dd028..fe2adc1 100644
--- a/BOOK/final-system/multilib/gmp-64bit.xml
+++ b/BOOK/final-system/multilib/gmp-64bit.xml
@@ -73,6 +73,14 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
     href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
     <para os="j">Create the 64bit header file:</para>
 
 <screen os="k"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
diff --git a/BOOK/final-system/multilib/iproute2.xml b/BOOK/final-system/multilib/iproute2.xml
index 76494c0..be4f151 100644
--- a/BOOK/final-system/multilib/iproute2.xml
+++ b/BOOK/final-system/multilib/iproute2.xml
@@ -45,8 +45,10 @@
     href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= LIBDIR=/usr/lib64 \
-    DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= \
+    LIBDIR=/usr/lib64 \
+    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
+    MANDIR=/usr/share/man</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/iproute2.xml"
diff --git a/BOOK/final-system/multilib/kbd.xml b/BOOK/final-system/multilib/kbd.xml
index 6a5d818..7bac72d 100644
--- a/BOOK/final-system/multilib/kbd.xml
+++ b/BOOK/final-system/multilib/kbd.xml
@@ -54,6 +54,14 @@
     href="../common/kbd.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/mpfr-64bit.xml b/BOOK/final-system/multilib/mpfr-64bit.xml
index efb46a7..8f59717 100644
--- a/BOOK/final-system/multilib/mpfr-64bit.xml
+++ b/BOOK/final-system/multilib/mpfr-64bit.xml
@@ -35,7 +35,8 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+  ./configure --prefix=/usr --libdir=/usr/lib64
+  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/mpfr.xml"
diff --git a/BOOK/final-system/multilib/mpfr-n32.xml b/BOOK/final-system/multilib/mpfr-n32.xml
index 5296f57..fc1b04b 100644
--- a/BOOK/final-system/multilib/mpfr-n32.xml
+++ b/BOOK/final-system/multilib/mpfr-n32.xml
@@ -36,7 +36,8 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-  ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+  ./configure --prefix=/usr --libdir=/usr/lib32
+  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/mpfr.xml"
diff --git a/BOOK/final-system/multilib/mpfr.xml b/BOOK/final-system/multilib/mpfr.xml
index ba1a2c1..8732c89 100644
--- a/BOOK/final-system/multilib/mpfr.xml
+++ b/BOOK/final-system/multilib/mpfr.xml
@@ -36,7 +36,8 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-  ./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
+  ./configure --prefix=/usr --host=${CLFS_TARGET32}
+  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/mpfr.xml"
diff --git a/BOOK/final-system/multilib/sed.xml b/BOOK/final-system/multilib/sed.xml
index ab685dd..645230c 100644
--- a/BOOK/final-system/multilib/sed.xml
+++ b/BOOK/final-system/multilib/sed.xml
@@ -26,7 +26,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --bindir=/bin</userinput></screen>
+   --bindir=/bin --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/sed.xml"
diff --git a/BOOK/final-system/multilib/tar.xml b/BOOK/final-system/multilib/tar.xml
index e178cd6..3f93152 100644
--- a/BOOK/final-system/multilib/tar.xml
+++ b/BOOK/final-system/multilib/tar.xml
@@ -69,6 +69,14 @@
     href="../common/tar.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/util-linux-64bit.xml b/BOOK/final-system/multilib/util-linux-64bit.xml
index 8843aa1..c94188e 100644
--- a/BOOK/final-system/multilib/util-linux-64bit.xml
+++ b/BOOK/final-system/multilib/util-linux-64bit.xml
@@ -34,7 +34,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
-    --enable-write</userinput></screen>
+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
diff --git a/BOOK/final-system/multilib/util-linux-n32.xml b/BOOK/final-system/multilib/util-linux-n32.xml
index 1038407..060d666 100644
--- a/BOOK/final-system/multilib/util-linux-n32.xml
+++ b/BOOK/final-system/multilib/util-linux-n32.xml
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
-    --enable-write</userinput></screen>
+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
diff --git a/BOOK/final-system/multilib/util-linux.xml b/BOOK/final-system/multilib/util-linux.xml
index 9383ee3..4aa28fb 100644
--- a/BOOK/final-system/multilib/util-linux.xml
+++ b/BOOK/final-system/multilib/util-linux.xml
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
-    --enable-write</userinput></screen>
+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
diff --git a/BOOK/final-system/multilib/xz-64bit.xml b/BOOK/final-system/multilib/xz-64bit.xml
index 0f86ac4..430c831 100644
--- a/BOOK/final-system/multilib/xz-64bit.xml
+++ b/BOOK/final-system/multilib/xz-64bit.xml
@@ -25,7 +25,8 @@
     href="xz.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --libdir=/usr/lib64 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="xz.xml"
diff --git a/BOOK/final-system/multilib/xz-n32.xml b/BOOK/final-system/multilib/xz-n32.xml
index cc23881..8944f2c 100644
--- a/BOOK/final-system/multilib/xz-n32.xml
+++ b/BOOK/final-system/multilib/xz-n32.xml
@@ -26,7 +26,8 @@
     href="xz.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+    --libdir=/usr/lib32 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="xz.xml"
diff --git a/BOOK/final-system/multilib/xz.xml b/BOOK/final-system/multilib/xz.xml
index 08749dc..b49127a 100644
--- a/BOOK/final-system/multilib/xz.xml
+++ b/BOOK/final-system/multilib/xz.xml
@@ -26,7 +26,8 @@
     href="../common/xz.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+    --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/xz.xml"

commit ce32b58d4d3f85ee76f2efbda2961c908bf8e091
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Tue Apr 8 20:55:43 2014 -0500

    Revise the note text for the removal of setting the hostname when utilizing the boot method as it is in procps now.

diff --git a/BOOK/final-system/common/perl.xml b/BOOK/final-system/common/perl.xml
index d75a9ce..50f4088 100644
--- a/BOOK/final-system/common/perl.xml
+++ b/BOOK/final-system/common/perl.xml
@@ -36,7 +36,7 @@
 
     <note os="a00">
       <para>If you are following the boot method you will need to enable the
-      loopback device as well as set a hostname for some of the tests:</para>
+      loopback device:</para>
 
 <screen><userinput remap="test">ip link set lo up</userinput></screen>
     </note>

commit 8699cff053e028c4eb1a2685ceb269cea2ff48ef
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Tue Apr 8 20:54:35 2014 -0500

    Add note to procps and procps 32 bit when using the boot method to set the hostname or else a couple of tests will fail.

diff --git a/BOOK/final-system/common/procps-ng.xml b/BOOK/final-system/common/procps-ng.xml
index df690c4..2d9b423 100644
--- a/BOOK/final-system/common/procps-ng.xml
+++ b/BOOK/final-system/common/procps-ng.xml
@@ -46,6 +46,13 @@
 
 <screen os="e"><userinput>make</userinput></screen>
 
+    <note os="note1">
+      <para>When using the boot method, two tests will fail if the hostname is
+      not set:</para>
+
+<screen><userinput remap="test">hostname clfs</userinput></screen>
+    </note>
+
     <para os="f">Remove the test which fails when scripting does not use a tty
     device. Run the following commands:</para>
 
diff --git a/BOOK/final-system/multilib/procps-ng.xml b/BOOK/final-system/multilib/procps-ng.xml
index bc4d7b0..2dfef1f 100644
--- a/BOOK/final-system/multilib/procps-ng.xml
+++ b/BOOK/final-system/multilib/procps-ng.xml
@@ -44,6 +44,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/procps-ng.xml"
+    xpointer="xpointer(//*[@os='note1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

commit 87ec28c1b91d1089e2069df0a0643edb6493bc00
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Tue Apr 8 20:53:29 2014 -0500

    Add master changelog entry for documentation installation with versioned directories with Automake, DBus, Flex, Gawk, Gettext, GMP, IPRoute2, KBD, MPFR, Readline, Sed, Tar, Util-linux and XZ.

diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 30d81df..9600bc0 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,17 @@
 -->
 
     <listitem>
+      <para>08 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Add versioned doc directories for
+          Automake, DBus, Flex, Gawk, Gettext, GMP, IPRoute2, KBD, MPFR,
+          Readline, Sed, Tar, Util-linux and XZ.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>06 April 2014</para>
       <itemizedlist>
         <listitem>

commit b7448351d9224e246a576e31d3c53d8c9f6c9b77
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Tue Apr 8 20:03:42 2014 -0500

    Correct the automake-version entity so automake contents includes the proper version for aclocal- automake- programs and directories.

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 9308193..3a347b1 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -35,8 +35,8 @@
 <!ENTITY autoconf-md5 "50f97f4159805e374639a73e2636f22e">
 <!ENTITY autoconf-home "&gnu-software;autoconf">
 
-<!ENTITY automake-version2 "1.14.1">
-<!ENTITY automake-version "&automake-version2;">
+<!ENTITY automake-version2 "1.14">
+<!ENTITY automake-version "&automake-version2;.1">
 <!ENTITY automake-size "1,489 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
 <!ENTITY automake-md5 "7fc29854c520f56b07aa232a0f880292">

commit 42484773e56ac951a60b46d056158ef2ca492e26
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Tue Apr 8 19:54:00 2014 -0500

    Update date.

diff --git a/BOOK/general.ent b/BOOK/general.ent
index d061b82..990a5a1 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY month "06"> <!-- Use two digits -->
+<!ENTITY month "08"> <!-- Use two digits -->
 <!ENTITY month_name "April">
 <!ENTITY day "04"> <!-- Use two digits -->
 <!ENTITY year "2014"> <!-- Use four digits -->

commit 4ff8077d092c811613f7e93d67efdf4c392285b1
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Tue Apr 8 19:46:23 2014 -0500

    Remove hostname clfs command from test commands because procps-ng has a note to run hostname clfs command when using the boot method.

diff --git a/BOOK/final-system/common/perl.xml b/BOOK/final-system/common/perl.xml
index 6c980c5..d75a9ce 100644
--- a/BOOK/final-system/common/perl.xml
+++ b/BOOK/final-system/common/perl.xml
@@ -38,8 +38,7 @@
       <para>If you are following the boot method you will need to enable the
       loopback device as well as set a hostname for some of the tests:</para>
 
-<screen><userinput remap="test">ip link set lo up
-hostname clfs</userinput></screen>
+<screen><userinput remap="test">ip link set lo up</userinput></screen>
     </note>
 
     <para os="a01">Before starting to configure, create a basic

commit d48889951ea2c6a1ea9aade529bd6dc964030b21
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Tue Apr 8 19:35:45 2014 -0500

    Add a sed command to remove arpd.8 in man/man8/Makefile to avoid the message cannot stat 'arpd.8': No such file or directory during install.

diff --git a/BOOK/final-system/common/iproute2.xml b/BOOK/final-system/common/iproute2.xml
index 53e97de..16a1184 100644
--- a/BOOK/final-system/common/iproute2.xml
+++ b/BOOK/final-system/common/iproute2.xml
@@ -35,7 +35,7 @@
 
 <screen os="s2"><userinput>sed -i '/^TARGETS/s at arpd@@g' misc/Makefile
 sed -i '/ARPD/d' Makefile
-rm -v man/man8/arpd.8</userinput></screen>
+sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
 
     <para os="f1">Remove unused libnl headers:</para>
     

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/automake.xml           |    2 +-
 BOOK/final-system/common/dbus.xml               |    5 +++--
 BOOK/final-system/common/flex.xml               |    4 +++-
 BOOK/final-system/common/gawk.xml               |    8 +++++++-
 BOOK/final-system/common/gettext.xml            |    5 +++--
 BOOK/final-system/common/gmp.xml                |    8 ++++++++
 BOOK/final-system/common/iproute2.xml           |    8 +++++---
 BOOK/final-system/common/kbd.xml                |    6 ++++++
 BOOK/final-system/common/mpfr.xml               |    5 +++--
 BOOK/final-system/common/perl.xml               |    5 ++---
 BOOK/final-system/common/procps-ng.xml          |    7 +++++++
 BOOK/final-system/common/readline.xml           |    4 ++--
 BOOK/final-system/common/sed.xml                |    5 +++--
 BOOK/final-system/common/tar.xml                |    6 ++++++
 BOOK/final-system/common/util-linux.xml         |    5 +++--
 BOOK/final-system/common/vim.xml                |   16 ++++------------
 BOOK/final-system/common/xz.xml                 |    4 ++--
 BOOK/final-system/multilib/automake.xml         |    3 ++-
 BOOK/final-system/multilib/dbus-64bit.xml       |    3 ++-
 BOOK/final-system/multilib/dbus-n32.xml         |    3 ++-
 BOOK/final-system/multilib/dbus.xml             |    3 ++-
 BOOK/final-system/multilib/flex-64bit.xml       |    2 +-
 BOOK/final-system/multilib/flex-n32.xml         |    2 +-
 BOOK/final-system/multilib/flex.xml             |    3 ++-
 BOOK/final-system/multilib/gawk.xml             |    8 ++++++++
 BOOK/final-system/multilib/gettext-64bit.xml    |    3 ++-
 BOOK/final-system/multilib/gettext-n32.xml      |    3 ++-
 BOOK/final-system/multilib/gettext.xml          |    3 ++-
 BOOK/final-system/multilib/gmp-64bit.xml        |    8 ++++++++
 BOOK/final-system/multilib/iproute2.xml         |    6 ++++--
 BOOK/final-system/multilib/kbd.xml              |    8 ++++++++
 BOOK/final-system/multilib/mpfr-64bit.xml       |    3 ++-
 BOOK/final-system/multilib/mpfr-n32.xml         |    3 ++-
 BOOK/final-system/multilib/mpfr.xml             |    3 ++-
 BOOK/final-system/multilib/procps-ng.xml        |    4 ++++
 BOOK/final-system/multilib/sed.xml              |    2 +-
 BOOK/final-system/multilib/tar.xml              |    8 ++++++++
 BOOK/final-system/multilib/util-linux-64bit.xml |    2 +-
 BOOK/final-system/multilib/util-linux-n32.xml   |    2 +-
 BOOK/final-system/multilib/util-linux.xml       |    2 +-
 BOOK/final-system/multilib/vim.xml              |    8 --------
 BOOK/final-system/multilib/xz-64bit.xml         |    3 ++-
 BOOK/final-system/multilib/xz-n32.xml           |    3 ++-
 BOOK/final-system/multilib/xz.xml               |    3 ++-
 BOOK/general.ent                                |    2 +-
 BOOK/introduction/common/changelog.xml          |   11 +++++++++++
 BOOK/packages.ent                               |    4 ++--
 47 files changed, 156 insertions(+), 68 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book



More information about the Clfs-commits mailing list