Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 8bd18171b7a8abbc38f870682808249713393edd)
+++ BOOK/introduction/common/changelog.xml	(revision a32721a4fa0c09d138917015d927886940eb94c8)
@@ -38,4 +38,13 @@
 
     <listitem>
+      <para>December 7, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Ported Gettext update from Temp-system LFS to Cross-LFS.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 6, 2005</para>
       <itemizedlist>
Index: OK/temp-system/64/gettext.xml
===================================================================
--- BOOK/temp-system/64/gettext.xml	(revision 8bd18171b7a8abbc38f870682808249713393edd)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gettext" role="wrap">
-  <?dbhtml filename="gettext.html"?>
-
-  <title>Gettext-&gettext-version;</title>
-
-  <indexterm zone="ch-temp-system-gettext">
-    <primary sortas="a-Gettext">Gettext</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gettext.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-   ./configure --prefix=/tools \
-   --host=${LFS_TARGET} --disable-libasprintf \
-   --without-csharp --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gettext" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/common/gettext.xml
===================================================================
--- BOOK/temp-system/common/gettext.xml	(revision 8bd18171b7a8abbc38f870682808249713393edd)
+++ BOOK/temp-system/common/gettext.xml	(revision a32721a4fa0c09d138917015d927886940eb94c8)
@@ -30,7 +30,8 @@
     <para os="c">Prepare Gettext for compilation:</para>
 
-<screen os="d"><userinput>./configure --prefix=/tools \
-   --host=${LFS_TARGET} --disable-libasprintf \
-   --without-csharp --cache-file=config.cache</userinput></screen>
+<screen os="d"><userinput>cd gettext-tools
+   ./configure --prefix=/tools \
+   --host=${LFS_TARGET} --disable-shared \
+   --cache-file=config.cache</userinput></screen>
 
     <variablelist os="e">
@@ -38,20 +39,7 @@
 
       <varlistentry os="e1">
-        <term><parameter>--disable-libasprintf</parameter></term>
+        <term><parameter>--disable-shared</parameter></term>
         <listitem>
-          <para>This flag tells Gettext not to build the <filename
-          class="libraryfile">asprintf</filename> library. Because
-          nothing in this chapter or the next requires this library
-          and Gettext gets rebuilt later, exclude it to save time
-          and space.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e2">
-        <term><parameter>--without-csharp</parameter></term>
-        <listitem>
-          <para>This ensures that Gettext does not build support for the C#
-          compiler which may be present on the host but will not be available
-          when building the final system.</para>
+          <para>This tells Gettext not to create a shared library.</para>
         </listitem>
       </varlistentry>
@@ -61,9 +49,10 @@
     <para os="f">Compile the package:</para>
 
-<screen os="g"><userinput>make</userinput></screen>
+<screen os="g"><userinput>make -C lib
+make -C src msgfmt</userinput></screen>
 
     <para os="h">Install the package:</para>
 
-<screen os="i"><userinput>make install</userinput></screen>
+<screen os="i"><userinput>cp -v src/msgfmt /tools/bin</userinput></screen>
 
   </sect2>
Index: BOOK/temp-system/mips64-64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-64-chapter.xml	(revision 8bd18171b7a8abbc38f870682808249713393edd)
+++ BOOK/temp-system/mips64-64-chapter.xml	(revision a32721a4fa0c09d138917015d927886940eb94c8)
@@ -26,5 +26,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
Index: BOOK/temp-system/mips64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-chapter.xml	(revision 8bd18171b7a8abbc38f870682808249713393edd)
+++ BOOK/temp-system/mips64-chapter.xml	(revision a32721a4fa0c09d138917015d927886940eb94c8)
@@ -29,6 +29,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-n32.xml"/>
Index: OK/temp-system/multilib/gettext-64bit.xml
===================================================================
--- BOOK/temp-system/multilib/gettext-64bit.xml	(revision 8bd18171b7a8abbc38f870682808249713393edd)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gettext-64bit" role="wrap">
-  <title>Gettext-&gettext-version; 64 Bit</title>
-  <?dbhtml filename="gettext-64.html"?>
-
-  <indexterm zone="ch-temp-system-gettext-64bit">
-    <primary sortas="a-Gettext">Gettext</primary>
-    <secondary>temporary system, 64 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gettext.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-   ./configure --prefix=/tools --libdir=/tools/lib64 \
-   --host=${LFS_TARGET} --disable-libasprintf \
-   --without-csharp --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gettext" role="."/></para>
-
-  </sect2>
-
-</sect1>
-
Index: OK/temp-system/multilib/gettext-n32.xml
===================================================================
--- BOOK/temp-system/multilib/gettext-n32.xml	(revision 8bd18171b7a8abbc38f870682808249713393edd)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gettext-n32" role="wrap">
-  <title>Gettext-&gettext-version; N32</title>
-  <?dbhtml filename="gettext-n32.html"?>
-
-  <indexterm zone="ch-temp-system-gettext-n32">
-    <primary sortas="a-Gettext">Gettext</primary>
-    <secondary>temporary system, N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gettext.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="${CC} ${BUILDN32}" CXX="${CXX} ${BUILDN32}" \
-   ./configure --prefix=/tools --libdir=/tools/lib32 \
-   --host=${LFS_TARGET} --disable-libasprintf \
-   --without-csharp --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>CXX="${CXX} ${BUILDN32}"</parameter></term>
-        <listitem>
-          <para>Forces Gettext is use our Target Architecture g++ compiler
-          with our N32 flags.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gettext.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gettext" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/gettext.xml
===================================================================
--- BOOK/temp-system/multilib/gettext.xml	(revision 8bd18171b7a8abbc38f870682808249713393edd)
+++ BOOK/temp-system/multilib/gettext.xml	(revision a32721a4fa0c09d138917015d927886940eb94c8)
@@ -35,29 +35,11 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="${CC} ${BUILD32}" CXX="${CXX} ${BUILD32}" \
-   ./configure --prefix=/tools \
-   --host=${LFS_TARGET} --disable-libasprintf \
-   --without-csharp --cache-file=config.cache</userinput></screen>
+<screen os="d"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+   ./configure --prefix=/tools --disable-shared \
+   --cache-file=config.cache</userinput></screen>
 
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>CXX="${CXX} ${BUILD32}"</parameter></term>
-        <listitem>
-          <para>Forces Gettext is use our Target Architecture g++ compiler
-          with our 32 bits build flags.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gettext.xml"
-      xpointer="xpointer(//*[@os='e1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gettext.xml"
-      xpointer="xpointer(//*[@os='e2'])"/>
-
-    </variablelist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-64-chapter.xml	(revision 8bd18171b7a8abbc38f870682808249713393edd)
+++ BOOK/temp-system/sparc64-64-chapter.xml	(revision a32721a4fa0c09d138917015d927886940eb94c8)
@@ -26,5 +26,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
Index: BOOK/temp-system/sparc64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-chapter.xml	(revision 8bd18171b7a8abbc38f870682808249713393edd)
+++ BOOK/temp-system/sparc64-chapter.xml	(revision a32721a4fa0c09d138917015d927886940eb94c8)
@@ -28,5 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
Index: BOOK/temp-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-64-chapter.xml	(revision 8bd18171b7a8abbc38f870682808249713393edd)
+++ BOOK/temp-system/x86_64-64-chapter.xml	(revision a32721a4fa0c09d138917015d927886940eb94c8)
@@ -26,5 +26,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
Index: BOOK/temp-system/x86_64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-chapter.xml	(revision 8bd18171b7a8abbc38f870682808249713393edd)
+++ BOOK/temp-system/x86_64-chapter.xml	(revision a32721a4fa0c09d138917015d927886940eb94c8)
@@ -28,5 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
