Build msgmerge and xgettext programs in temporary gettext instead of moving gettext before attr in chap06. Move shadow after attr and libcap.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10161 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter05/gettext.xml

@@ -44,7 +44,7 @@
     <title>Installation of Gettext</title>
 
     <para>For our temporary set of tools, we only need to build and install
-    one binary from Gettext.</para>
+    three programs from Gettext.</para>
 
     <para>Prepare Gettext for compilation:</para>
 
@@ -76,16 +76,19 @@ EMACS="no" ./configure --prefix=/tools --disable-shared</userinput></screen>
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make -C gnulib-lib
-make -C src msgfmt</userinput></screen>
+make -C src msgfmt
+make -C src msgmerge
+make -C src xgettext</userinput></screen>
 
-    <para>As only one binary has been compiled, it is not possible to run the
+    <para>As only three programs have been compiled, it is not possible to run the
     test suite without compiling additional support libraries from the Gettext
     package. It is therefore not recommended to attempt to run the test suite at
     this stage.</para>
 
-    <para>Install the <command>msgfmt</command> binary:</para>
+    <para>Install the <command>msgfmt</command>, <command>msgmerge</command> and
+     <command>xgettext</command> programs:</para>
 
-<screen><userinput remap="install">cp -v src/msgfmt /tools/bin</userinput></screen>
+<screen><userinput remap="install">cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
 
   </sect2>
 

chapter06/chapter06.xml

@@ -36,10 +36,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
@@ -58,6 +57,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>

general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SYSTEMD-20130215">
-<!ENTITY releasedate "February 15, 2013">
+<!ENTITY version "SYSTEMD-20130216">
+<!ENTITY releasedate "February 16, 2013">
 <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.3">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->