Author: krejzi
Date: Sat Feb 16 13:29:22 2013
New Revision: 10161
Log:
Build msgmerge and xgettext programs in temporary gettext instead of moving
gettext before attr in chap06. Move shadow after attr and libcap.
Modified:
branches/systemd/BOOK/chapter05/gettext.xml
branches/systemd/BOOK/chapter06/chapter06.xml
branches/systemd/BOOK/general.ent
Modified: branches/systemd/BOOK/chapter05/gettext.xml
==============================================================================
--- branches/systemd/BOOK/chapter05/gettext.xml Fri Feb 15 13:20:26 2013
(r10160)
+++ branches/systemd/BOOK/chapter05/gettext.xml Sat Feb 16 13:29:22 2013
(r10161)
@@ -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 @@
<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>
Modified: branches/systemd/BOOK/chapter06/chapter06.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/chapter06.xml Fri Feb 15 13:20:26
2013 (r10160)
+++ branches/systemd/BOOK/chapter06/chapter06.xml Sat Feb 16 13:29:22
2013 (r10161)
@@ -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"/>
Modified: branches/systemd/BOOK/general.ent
==============================================================================
--- branches/systemd/BOOK/general.ent Fri Feb 15 13:20:26 2013 (r10160)
+++ branches/systemd/BOOK/general.ent Sat Feb 16 13:29:22 2013 (r10161)
@@ -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
– -->
<!ENTITY milestone "7.3">
<!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or
"x.y[-pre{x}]" -->
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
