Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/mips64/pkg-config-lite.xml

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-pkg-config" role="wrap">
    9   <?dbhtml filename="pkg-config.html"?>
     8<sect1 id="ch-system-pkg-config-lite" role="wrap">
     9  <?dbhtml filename="pkg-config-lite.html"?>
    1010
    11   <title>Pkg-config-&pkg-config-version;</title>
     11  <title>Pkg-config-lite-&pkg-config-lite-version;</title>
    1212
    13   <indexterm zone="ch-system-pkg-config">
    14     <primary sortas="a-Autoconf">Pkg-config</primary>
     13  <indexterm zone="ch-system-pkg-config-lite">
     14    <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="../common/pkg-config.xml"
     18  href="../common/pkg-config-lite.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of Pkg-config</title>
     22    <title>Installation of Pkg-config-lite</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/pkg-config.xml"
     25    href="../common/pkg-config-lite.xml"
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../multilib/pkg-config.xml"
     29    href="../multilib/pkg-config-lite.xml"
    3030    xpointer="xpointer(//*[@os='b'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/pkg-config.xml"
     33    href="../common/pkg-config-lite.xml"
    3434    xpointer="xpointer(//*[@os='c'])"/>
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/pkg-config.xml"
     37    href="../common/pkg-config-lite.xml"
    3838    xpointer="xpointer(//*[@os='d'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/pkg-config.xml"
     41    href="../common/pkg-config-lite.xml"
    4242    xpointer="xpointer(//*[@os='e'])"/>
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/pkg-config.xml"
     45    href="../common/pkg-config-lite.xml"
     46    xpointer="xpointer(//*[@os='e2'])"/>
     47
     48    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     49    href="../common/pkg-config-lite.xml"
    4650    xpointer="xpointer(//*[@os='f'])"/>
    4751
    4852    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/pkg-config.xml"
     53    href="../common/pkg-config-lite.xml"
    5054    xpointer="xpointer(//*[@os='g'])"/>
    5155
    5256    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="../multilib/pkg-config.xml"
     57    href="../multilib/pkg-config-lite.xml"
    5458    xpointer="xpointer(//*[@os='m1'])"/>
    5559
    … …  
    5963
    6064    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    61     href="../multilib/pkg-config.xml"
     65    href="../multilib/pkg-config-lite.xml"
    6266    xpointer="xpointer(//*[@os='m3'])"/>
    6367
    … …  
    7175
    7276  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    73   href="../common/pkg-config.xml"
    74   xpointer="xpointer(id('contents-pkg-config'))"/>
     77  href="../common/pkg-config-lite.xml"
     78  xpointer="xpointer(id('contents-pkg-config-lite'))"/>
    7579
    7680</sect1>
Note: See TracChangeset for help on using the changeset viewer.