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/common/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-Pkg-config">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
     
    1818    <title/>
    1919
    20     <para>Pkg-config is a tool to help you insert the correct compiler options
     20    <para>Pkg-config-lite is a tool to help you insert the correct compiler options
    2121    on the command line when compiling applications and libraries.</para>
    2222
     
    2424
    2525  <sect2 role="installation">
    26     <title>Installation of Pkg-config</title>
     26    <title>Installation of Pkg-config-lite</title>
    2727
    28     <para os="a">Prepare Pkg-config for compilation:</para>
     28    <para os="a">Prepare Pkg-config-lite for compilation:</para>
    2929
    30 <screen os="b"><userinput>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \
    31     GLIB_LIBS="-lglib-2.0" \
    32     ./configure --prefix=/usr</userinput></screen>
    33 
    34     <variablelist os="bb">
    35       <title>The meaning of the new configure option:</title>
    36 
    37       <varlistentry>
    38         <term><parameter>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include"</parameter></term>
    39         <term><parameter>GLIB_LIBS="-lglib-2.0"</parameter></term>
    40         <listitem>
    41           <para>Pkg-config no longer comes with Glib and because Pkg-config
    42         has not been installed itself it needs to be told where Glib is.</para>
    43         </listitem>
    44       </varlistentry>
    45     </variablelist>
     30<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
    4631
    4732    <para os="c">Compile the package:</para>
     
    4934<screen os="d"><userinput>make</userinput></screen>
    5035
    51     <para os="e">To test the results, issue:
    52     <userinput>make check</userinput>.</para>
     36    <para os="e">To test the results, issue:</para>
     37
     38<screen os="e2"><userinput remap="test">make check</userinput></screen>
    5339
    5440    <para os="f">Install the package:</para>
     
    5844  </sect2>
    5945
    60   <sect2 id="contents-pkg-config" role="content">
    61     <title>Contents of Pkg-config</title>
     46  <sect2 id="contents-pkg-config-lite" role="content">
     47    <title>Contents of Pkg-config-lite</title>
    6248
    6349    <segmentedlist>
     
    7662      <?dbhtml list-presentation="table"?>
    7763
    78       <varlistentry id="pkg-config">
     64      <varlistentry id="pkg-config-lite">
    7965        <term><command>pkg-config</command></term>
    8066        <listitem>
     
    8268          information about installed libraries in the system. It is typically
    8369          used to compile and link against one or more libraries.</para>
    84           <indexterm zone="ch-system-pkg-config pkg-config">
    85             <primary sortas="b-pkg-config">pkg-config</primary>
     70          <indexterm zone="ch-system-pkg-config-lite pkg-config-lite">
     71            <primary sortas="b-pkg-config-lite">pkg-config</primary>
    8672          </indexterm>
    8773        </listitem>
Note: See TracChangeset for help on using the changeset viewer.