Changeset 03e6a40 for BOOK/temp-system/common/gawk.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 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/temp-system/common/gawk.xml (modified) (1 diff)

BOOK/temp-system/common/gawk.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of Gawk</title>
-
-    <para os="s1">Apply a sed which will allow the build system to complete without error:</para>
-
-<screen os="s2"><userinput>cp -v extension/Makefile.in{,.orig}
-sed -e 's/check-recursive all-recursive: check-for-shared-lib-support/check-recursive all-recursive:/' \
-  extension/Makefile.in.orig > extension/Makefile.in</userinput></screen>
 
     <para os="a">Prepare Gawk for compilation:</para>