[Clfs-commits] commit: r4047 - in /trunk/BOOK/final-system: multilib/libtool-64bit.xml ppc64/libtool.xml sparc64/libtool.xml x86_64/libtool.xml

[svn at cross-lfs.org]

Author: jciccone
Date: Sat Oct  4 12:49:37 2008
New Revision: 4047

Log:
Corrections to wrapper libtool with the multiarch wrapper.

Modified:
    trunk/BOOK/final-system/multilib/libtool-64bit.xml
    trunk/BOOK/final-system/ppc64/libtool.xml
    trunk/BOOK/final-system/sparc64/libtool.xml
    trunk/BOOK/final-system/x86_64/libtool.xml

Modified: trunk/BOOK/final-system/multilib/libtool-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/libtool-64bit.xml (original)
+++ trunk/BOOK/final-system/multilib/libtool-64bit.xml Sat Oct  4 12:49:37 2008
@@ -58,7 +58,8 @@
     href="libtool.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen os="m2"><userinput>mv -v /usr/bin/libtool{,64}</userinput></screen>
+<screen os="m2"><userinput>mv -v /usr/bin/libtool{,-64}
+ln -s multiarch_wrapper /usr/bin/libtool</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/ppc64/libtool.xml
==============================================================================
--- trunk/BOOK/final-system/ppc64/libtool.xml (original)
+++ trunk/BOOK/final-system/ppc64/libtool.xml Sat Oct  4 12:49:37 2008
@@ -73,7 +73,9 @@
     href="../multilib/libtool.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen os="m2"><userinput>mv -v /usr/bin/libtool{,-32}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/libtool.xml"
+    xpointer="xpointer(//*[@os='m2'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/sparc64/libtool.xml
==============================================================================
--- trunk/BOOK/final-system/sparc64/libtool.xml (original)
+++ trunk/BOOK/final-system/sparc64/libtool.xml Sat Oct  4 12:49:37 2008
@@ -73,7 +73,9 @@
     href="../multilib/libtool.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen os="m2"><userinput>mv -v /usr/bin/libtool{,-32}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/libtool.xml"
+    xpointer="xpointer(//*[@os='m2'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/x86_64/libtool.xml
==============================================================================
--- trunk/BOOK/final-system/x86_64/libtool.xml (original)
+++ trunk/BOOK/final-system/x86_64/libtool.xml Sat Oct  4 12:49:37 2008
@@ -73,7 +73,9 @@
     href="../multilib/libtool.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen os="m2"><userinput>mv -v /usr/bin/libtool{,-32}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/libtool.xml"
+    xpointer="xpointer(//*[@os='m2'])"/>
 
   </sect2>