Changeset 229ed25 for BOOK/final-system/common/libee.xml

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:

• BOOK/final-system/common/libee.xml (modified) (3 diffs)

BOOK/final-system/common/libee.xml

@@ -31 +31 @@
     <para os="c">Compile the package:</para>
 
+<note os="n1">
+    <para>Libee will fail to compile if using multiple jobs with make. Append "<command>-j 1</command>" to the following make command:</para>
+</note>
+
 <screen os="d"><userinput>make</userinput></screen>
 
@@ -45 +49 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>convert</seg>
+        <seg>libee-convert</seg>
         <seg>libee.[a,so]</seg>
+        <seg>/usr/include/libee</seg>
       </seglistitem>
     </segmentedlist>
@@ -59 +65 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="convert">
-        <term><command>convert</command></term>
+      <varlistentry id="libee-convert">
+        <term><command>libee-convert</command></term>
         <listitem>
           <para>todo</para>
-          <indexterm zone="ch-system-libee convert">
-            <primary sortas="b-convert">convert</primary>
+          <indexterm zone="ch-system-libee libee-convert">
+            <primary sortas="b-libee-convert">libee-convert</primary>
           </indexterm>
         </listitem>