r1346 - / trunk/BOOK trunk/BOOK/final-system trunk/BOOK/final-system/mips trunk/BOOK/final-system/mips64 trunk/BOOK/final-system/mips64-64 trunk/BOOK/introduction/mips trunk/BOOK/introduction/mips64 trunk/BOOK/introduction/mips64-64 trunk/BOOK/materials/mips trunk/BOOK/materials/mips64 trunk/BOOK/materials/mips64-64 trunk/BOOK/temp-system trunk/BOOK/temp-system/mips trunk/BOOK/temp-system/mips64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Thu Apr 6 02:01:16 PDT 2006


Author: jim
Date: 2006-04-06 03:01:09 -0600 (Thu, 06 Apr 2006)
New Revision: 1346

Removed:
   trunk/BOOK/final-system/mips/make.xml
   trunk/BOOK/final-system/mips64-64/make.xml
   trunk/BOOK/final-system/mips64/make.xml
   trunk/BOOK/temp-system/mips/make.xml
   trunk/BOOK/temp-system/mips64/make.xml
Modified:
   /
   trunk/BOOK/
   trunk/BOOK/final-system/mips-chapter.xml
   trunk/BOOK/final-system/mips64-64-chapter.xml
   trunk/BOOK/final-system/mips64-chapter.xml
   trunk/BOOK/introduction/mips/changelog.xml
   trunk/BOOK/introduction/mips64-64/changelog.xml
   trunk/BOOK/introduction/mips64/changelog.xml
   trunk/BOOK/materials/mips/patches.xml
   trunk/BOOK/materials/mips64-64/patches.xml
   trunk/BOOK/materials/mips64/patches.xml
   trunk/BOOK/patches.ent
   trunk/BOOK/temp-system/mips-chapter.xml
   trunk/BOOK/temp-system/mips64-64-chapter.xml
   trunk/BOOK/temp-system/mips64-chapter.xml
Log:
 r2788 at server (orig r1346):  jim | 2006-04-06 01:19:28 -0700
  r2783 at server:  jim | 2006-04-06 01:18:44 -0700
  Removed make config_update patch from mips architectures.
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1345
   + b6734a72-470d-0410-b049-f317dca95413:/:1346


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:2782
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:2783
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Deleted: trunk/BOOK/final-system/mips/make.xml
===================================================================
--- trunk/BOOK/final-system/mips/make.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/final-system/mips/make.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -1,63 +0,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-system-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-system-make">
-    <primary sortas="a-Make">Make</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/make.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <para os="p1">This patch updates <filename>config.guess</filename> and
-    <filename>config.sub</filename> for MIPS processors.</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&make-mips_update-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/make.xml"
-  xpointer="xpointer(id('contents-make'))"/>
-
-</sect1>

Modified: trunk/BOOK/final-system/mips-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips-chapter.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/final-system/mips-chapter.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -53,7 +53,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>

Deleted: trunk/BOOK/final-system/mips64/make.xml
===================================================================
--- trunk/BOOK/final-system/mips64/make.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/final-system/mips64/make.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -1,66 +0,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-system-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-system-make">
-    <primary sortas="a-Make">Make</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/make.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/make.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/make.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/make.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/make.xml"
-  xpointer="xpointer(id('contents-make'))"/>
-
-</sect1>

Deleted: trunk/BOOK/final-system/mips64-64/make.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64/make.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/final-system/mips64-64/make.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -1,66 +0,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-system-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-system-make">
-    <primary sortas="a-Make">Make</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/make.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/make.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/make.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/make.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/make.xml"
-  xpointer="xpointer(id('contents-make'))"/>
-
-</sect1>

Modified: trunk/BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64-chapter.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/final-system/mips64-64-chapter.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -53,7 +53,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>

Modified: trunk/BOOK/final-system/mips64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips64-chapter.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/final-system/mips64-chapter.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -75,7 +75,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>

Modified: trunk/BOOK/introduction/mips/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips/changelog.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/introduction/mips/changelog.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>April 6, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Remove make config update patch. No longer required.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 20, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64/changelog.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/introduction/mips64/changelog.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>April 6, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Remove make config update patch. No longer required.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 20, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64-64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64-64/changelog.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/introduction/mips64-64/changelog.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>April 6, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Remove make config update patch. No longer required.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 20, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/materials/mips/patches.xml
===================================================================
--- trunk/BOOK/materials/mips/patches.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/materials/mips/patches.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -96,14 +96,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="make-mips_update-patch">
-      <term>Make Config Update Patch - 33 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;make/&make-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry os="mktemp-mips_update-patch">
       <term>Mktemp Config Update Patch - 56 KB:</term>
       <listitem>

Modified: trunk/BOOK/materials/mips64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64/patches.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/materials/mips64/patches.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -69,10 +69,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='make-mips_update-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='mktemp-mips_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/materials/mips64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64-64/patches.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/materials/mips64-64/patches.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -66,10 +66,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='make-mips_update-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='mktemp-mips_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/patches.ent	2006-04-06 09:01:09 UTC (rev 1346)
@@ -131,8 +131,6 @@
 
 <!ENTITY linux-libc-headers-mips_atomic_fix-patch "linux-libc-headers-&linux-libc-headers-version;-mips_atomic_fix-1.patch">
 
-<!ENTITY make-mips_update-patch "make-&make-version;-mips_config_update-1.patch">
-
 <!ENTITY mktemp-mips_update-patch "mktemp-&mktemp-version;-mips_config_update-1.patch">
 
 <!ENTITY module-init-tools-mips_update-patch "module-init-tools-&module-init-tools-version;-mips_config_update-1.patch">

Deleted: trunk/BOOK/temp-system/mips/make.xml
===================================================================
--- trunk/BOOK/temp-system/mips/make.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/temp-system/mips/make.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -1,67 +0,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-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-temp-system-make">
-    <primary sortas="a-Make">Make</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/make.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/make.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/make.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-make" role="."/></para>
-
-  </sect2>
-
-</sect1>

Modified: trunk/BOOK/temp-system/mips-chapter.xml
===================================================================
--- trunk/BOOK/temp-system/mips-chapter.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/temp-system/mips-chapter.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -21,7 +21,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>

Deleted: trunk/BOOK/temp-system/mips64/make.xml
===================================================================
--- trunk/BOOK/temp-system/mips64/make.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/temp-system/mips64/make.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -1,67 +0,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-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-temp-system-make">
-    <primary sortas="a-Make">Make</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/make.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/make.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/make.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-make" role="."/></para>
-
-  </sect2>
-
-</sect1>

Modified: trunk/BOOK/temp-system/mips64-64-chapter.xml
===================================================================
--- trunk/BOOK/temp-system/mips64-64-chapter.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/temp-system/mips64-64-chapter.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -21,7 +21,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <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="multilib/gettext.xml"/>

Modified: trunk/BOOK/temp-system/mips64-chapter.xml
===================================================================
--- trunk/BOOK/temp-system/mips64-chapter.xml	2006-04-06 09:00:58 UTC (rev 1345)
+++ trunk/BOOK/temp-system/mips64-chapter.xml	2006-04-06 09:01:09 UTC (rev 1346)
@@ -21,7 +21,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <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="multilib/gettext.xml"/>




More information about the cross-lfs mailing list