Ignore:
Timestamp:
Jun 26, 2014, 2:52:21 AM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-sysvinit, sysvinit
Children:
c1c9615
Parents:
85dc806
git-author:
Chris Staub <chris@…> (06/26/14 02:49:55)
git-committer:
Chris Staub <chris@…> (06/26/14 02:52:21)
Message:

Kbd is installed before libpipeline, so move explanation of PKG_CONFIG_PATH to kbd

Conflicts:

BOOK/final-system/common/kbd.xml

Location:
BOOK/final-system/multilib
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/multilib/kbd.xml

    r85dc806 ref42827  
    3333    xpointer="xpointer(//*[@os='c'])"/>
    3434
    35 <screen os="d"><userinput>make</userinput></screen>
     35    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     36    href="../common/kbd.xml"
     37    xpointer="xpointer(//*[@os='d'])"/>
    3638
    3739    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6769    xpointer="xpointer(//*[@os='l'])"/>
    6870
     71    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     72    href="../common/kbd.xml"
     73    xpointer="xpointer(//*[@os='m'])"/>
     74
    6975  </sect2>
    7076

  • BOOK/final-system/multilib/libpipeline-64bit.xml

    r85dc806 ref42827  
    5555    xpointer="xpointer(//*[@os='h'])"/>
    5656
    57     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="../common/libpipeline.xml"
    59     xpointer="xpointer(//*[@os='i'])"/>
    60 
    6157  </sect2>
    6258

  • BOOK/final-system/multilib/libpipeline-n32.xml

    r85dc806 ref42827  
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3333    href="../common/libpipeline.xml"
     34    xpointer="xpointer(//*[@os='c'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37    href="../common/libpipeline.xml"
    3438    xpointer="xpointer(//*[@os='d'])"/>
    3539
    3640    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3741    href="../common/libpipeline.xml"
    38     xpointer="xpointer(//*[@os='e'])"/>
     42    xpointer="xpointer(//*[@os='g'])"/>
    3943
    4044    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4145    href="../common/libpipeline.xml"
    4246    xpointer="xpointer(//*[@os='h'])"/>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/libpipeline.xml"
    46     xpointer="xpointer(//*[@os='i'])"/>
    4747
    4848  </sect2>

  • BOOK/final-system/multilib/libpipeline.xml

    r85dc806 ref42827  
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3333    href="../common/libpipeline.xml"
     34    xpointer="xpointer(//*[@os='c'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37    href="../common/libpipeline.xml"
    3438    xpointer="xpointer(//*[@os='d'])"/>
    3539
    3640    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3741    href="../common/libpipeline.xml"
    38     xpointer="xpointer(//*[@os='e'])"/>
     42    xpointer="xpointer(//*[@os='g'])"/>
    3943
    4044    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4145    href="../common/libpipeline.xml"
    4246    xpointer="xpointer(//*[@os='h'])"/>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/libpipeline.xml"
    46     xpointer="xpointer(//*[@os='i'])"/>
    4747
    4848  </sect2>
Note: See TracChangeset for help on using the changeset viewer.