Changeset 03e6a40 for BOOK/final-system/common/bison.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (12 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/final-system/common/bison.xml (modified) (1 diff)

BOOK/final-system/common/bison.xml

@@ -25 +25 @@
     <title>Installation of Bison</title>
 
-    <para os="t3">The <command>configure </command>script does not determine
-    the correct value for the following. Set the value manually:</para>
-
-<screen os="t4"><userinput>echo "ac_cv_prog_lex_is_flex=yes" &gt; config.cache</userinput></screen>
-
     <para os="a">Prepare Bison for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --cache-file=config.cache</userinput></screen>
+<screen os="b"><userinput>M4=m4 ./configure --prefix=/usr</userinput></screen>
 
     <para os="c">Compile the package:</para>