Changeset 8a67f19 for chapter05

Timestamp:

03/31/2021 10:41:35 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

e9d172b

Parents:

f5ae110a

git-author:

Thomas Trepl <thomas@…> (05/20/2019 06:04:35 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:35 AM)

Message:

Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11608 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter05/gettext.xml (modified) (3 diffs)

chapter05/gettext.xml

@@ -44 +44 @@
     <title>Installation of Gettext</title>
 
-    <para>For our temporary set of tools, we only need to build and install
+    <para>For our temporary set of tools, we only need to install
     three programs from Gettext.</para>
 
     <para>Prepare Gettext for compilation:</para>
 
-<screen><userinput remap="configure">cd gettext-tools
-EMACS="no" ./configure --prefix=/tools --disable-shared</userinput></screen>
+<screen><userinput remap="configure">./configure --disable-shared</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure option:</title>
-
+<!--
       <varlistentry>
         <term><parameter>EMACS="no"</parameter></term>
@@ -63 +62 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry>
         <term><parameter>--disable-shared</parameter></term>
@@ -76 +75 @@
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make -C gnulib-lib
-make -C intl pluralx.c
-make -C src msgfmt
-make -C src msgmerge
-make -C src xgettext</userinput></screen>
+<screen><userinput remap="make">make</userinput></screen>
 
-    <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>
+    Due to the limited environment, running the test suite at this stage
+    is not recommended.</para>
 
     <para>Install the <command>msgfmt</command>, <command>msgmerge</command> and
     <command>xgettext</command> programs:</para>
 
-<screen><userinput remap="install">cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
+<screen><userinput remap="install">cp -v gettext-tools/src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
 
   </sect2>