Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/gmp.xml

    r88ef769 r03e6a40  
    7070<screen os="i"><userinput>make install</userinput></screen>
    7171
     72    <para os="j">Install the documentation:</para>
     73
     74<screen os="k"><userinput>mkdir -v /usr/share/doc/gmp-&gmp-version;
     75cp -v doc/{isa_abi_headache,configuration} doc/*.html \
     76    /usr/share/doc/gmp-&gmp-version;</userinput></screen>
     77
    7278  </sect2>
    7379
     
    7783    <segmentedlist>
    7884      <segtitle>Installed libraries</segtitle>
     85      <segtitle>Installed directory</segtitle>
    7986
    8087      <seglistitem>
    81         <seg>libgmp.[a,so], libgmpxx.[a,so], libmp.[a,so]</seg>
     88        <seg>libgmp.[a,so], libgmpxx.[a,so]</seg>
     89        <seg>/usr/share/doc/gmp-&gmp-version;</seg>
    8290      </seglistitem>
    8391    </segmentedlist>
     
    108116      </varlistentry>
    109117
    110       <varlistentry id="libmp">
    111         <term><filename class="libraryfile">libmp</filename></term>
    112         <listitem>
    113           <para>Contains the Berkeley MP compatibility library.</para>
    114           <indexterm zone="ch-system-gmp libmp">
    115             <primary sortas="c-libmp">libmp</primary>
    116           </indexterm>
    117         </listitem>
    118       </varlistentry>
    119 
    120118    </variablelist>
    121119
Note: See TracChangeset for help on using the changeset viewer.