Changeset 2447f2b

Timestamp:

Aug 2, 2010, 7:04:49 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

7c59b60

Parents:

c173967

Message:

Fix mismatched xincludes for flex.

Location:

BOOK/final-system/multilib

Files:

• flex-64bit.xml (modified) (1 diff)
• flex-n32.xml (modified) (1 diff)
• flex.xml (modified) (2 diffs)

BOOK/final-system/multilib/flex-64bit.xml

@@ -42 +42 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
+    href="../common/flex.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 

BOOK/final-system/multilib/flex-n32.xml

@@ -47 +47 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="g">There are some packages that expect to find the
+    <para os="h">There are some packages that expect to find the
     <filename class="libraryfile">lex</filename> library in <filename
     class="directory">/usr/lib32</filename>. Create a symlink to account for
     this:</para>
 
-<screen os="h"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
+<screen os="i"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/flex.xml

@@ -41 +41 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="h"><userinput>make libfl.a</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make install-libLIBRARIES</userinput></screen>
+<screen os="d"><userinput>make libfl.a libfl_pic.a</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -53 +47 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
+<screen os="g"><userinput>make install-libLIBRARIES</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>