Index: temp-system/64/perl.xml
===================================================================
--- temp-system/64/perl.xml	(revision 4d4f87767c4363276a03dac5db7983149cc9f869)
+++ temp-system/64/perl.xml	(revision c8819a60f033338c2e93f280246ab890556b2644)
@@ -42,6 +42,4 @@
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="e"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX'</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: temp-system/common/perl.xml
===================================================================
--- temp-system/common/perl.xml	(revision 4d4f87767c4363276a03dac5db7983149cc9f869)
+++ temp-system/common/perl.xml	(revision c8819a60f033338c2e93f280246ab890556b2644)
@@ -73,6 +73,6 @@
 sed -e "s@\(^ar=\).*@\1'${AR}'@g" \
     -e "s@\(^ranlib=\).*@\1'${RANLIB}'@g" \
-    -e "s@\(^cc=\).*@\1'${CC} ${BUILD32}'@g" \
-    -e "s@\(^ld=\).*@\1'${CC} ${BUILD32}'@g" config.sh.orig > config.sh</userinput></screen>
+    -e "s@\(^cc=\).*@\1'${CC}'@g" \
+    -e "s@\(^ld=\).*@\1'${CC}'@g" config.sh.orig > config.sh</userinput></screen>
 
 <para os="l">Now we will make miniperl for our architecture:</para>
Index: temp-system/common/texinfo.xml
===================================================================
--- temp-system/common/texinfo.xml	(revision 4d4f87767c4363276a03dac5db7983149cc9f869)
+++ temp-system/common/texinfo.xml	(revision c8819a60f033338c2e93f280246ab890556b2644)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD32}" ./configure --prefix=/tools \
+<screen os="b"><userinput>CC="${CC}" ./configure --prefix=/tools \
    --host=${LFS_TARGET} </userinput></screen>
 
Index: temp-system/mips64-chapter.xml
===================================================================
--- temp-system/mips64-chapter.xml	(revision 4d4f87767c4363276a03dac5db7983149cc9f869)
+++ temp-system/mips64-chapter.xml	(revision c8819a60f033338c2e93f280246ab890556b2644)
@@ -32,5 +32,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: temp-system/multilib/perl.xml
===================================================================
--- temp-system/multilib/perl.xml	(revision c8819a60f033338c2e93f280246ab890556b2644)
+++ temp-system/multilib/perl.xml	(revision c8819a60f033338c2e93f280246ab890556b2644)
@@ -0,0 +1,101 @@
+<?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-perl" role="wrap">
+  <?dbhtml filename="perl.html"?>
+
+  <title>Perl-&perl-version;</title>
+
+  <indexterm zone="ch-temp-system-perl">
+    <primary sortas="a-Perl">Perl</primary>
+    <secondary>temporary tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/perl.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Perl</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+<screen os="k"><userinput>cp config.sh{,.orig}
+sed -e "s@\(^ar=\).*@\1'${AR}'@g" \
+    -e "s@\(^ranlib=\).*@\1'${RANLIB}'@g" \
+    -e "s@\(^cc=\).*@\1'${CC} ${BUILD32}'@g" \
+    -e "s@\(^ld=\).*@\1'${CC} ${BUILD32}'@g" config.sh.orig > config.sh</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='r'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='s'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-perl" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: temp-system/sparc64-chapter.xml
===================================================================
--- temp-system/sparc64-chapter.xml	(revision 4d4f87767c4363276a03dac5db7983149cc9f869)
+++ temp-system/sparc64-chapter.xml	(revision c8819a60f033338c2e93f280246ab890556b2644)
@@ -32,5 +32,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: temp-system/x86_64-64-chapter.xml
===================================================================
--- temp-system/x86_64-64-chapter.xml	(revision 4d4f87767c4363276a03dac5db7983149cc9f869)
+++ temp-system/x86_64-64-chapter.xml	(revision c8819a60f033338c2e93f280246ab890556b2644)
@@ -32,5 +32,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: temp-system/x86_64-chapter.xml
===================================================================
--- temp-system/x86_64-chapter.xml	(revision 4d4f87767c4363276a03dac5db7983149cc9f869)
+++ temp-system/x86_64-chapter.xml	(revision c8819a60f033338c2e93f280246ab890556b2644)
@@ -32,5 +32,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
