Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (10 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 edited

Legend:

Unmodified
Added
Removed

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

    rec008670 r229ed25  
    2626    <title>Installation of Kbd</title>
    2727
    28     <para os="p1">Apply the following patch to fix a typo in es.po:</para>
    29 
    30     <screen os="p2"><userinput>patch -Np1 -i ../&kbd-espo-patch;</userinput></screen>
    31 
    3228    <para os="a">Prepare Kbd for compilation:</para>
    3329
    34 <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
     30<screen os="b"><userinput>PKG_CONFIG_PATH="/tools/lib/pkgconfig" \
     31    ./configure --prefix=/usr --disable-vlock --enable-optional-progs</userinput></screen>
    3532
    3633    <para os="c">Compile the package:</para>
Note: See TracChangeset for help on using the changeset viewer.