Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (12 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/readline.xml

    r88ef769 r03e6a40  
    4343    <para os="f">Install the package:</para>
    4444
    45 <screen os="g"><userinput>make install</userinput></screen>
     45<screen os="g"><userinput>make htmldir=/usr/share/doc/readline-&readline-version; install</userinput></screen>
    4646
    47     <para os="h">Install the documentation:</para>
     47    <para os="h">Now move the static libraries to a more appropriate location:</para>
    4848
    49 <screen os="i"><userinput>make install-doc</userinput></screen>
     49<screen os="i"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
    5050
    51     <para os="j">Now move the static libraries to a more appropriate location:</para>
     51    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib</filename>.</para>
    5252
    53 <screen os="k"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
    54 
    55     <para os="l">Next, remove the <filename class="extension">.so</filename>
    56     files in <filename class="directory">/lib</filename> and relink them into
    57     <filename class="directory">/usr/lib</filename>.</para>
    58 
    59 <screen os="m"><userinput>rm -v /lib/lib{readline,history}.so
    60 ln -svf ../../lib/libreadline.so.&readline-version2; /usr/lib/libreadline.so
    61 ln -svf ../../lib/libhistory.so.&readline-version2; /usr/lib/libhistory.so</userinput></screen>
     53<screen os="k"><userinput>ln -svf ../../lib/$(readlink /lib/libreadline.so) /usr/lib/libreadline.so
     54ln -svf ../../lib/$(readlink /lib/libhistory.so) /usr/lib/libhistory.so
     55rm -v /lib/lib{readline,history}.so</userinput></screen>
    6256
    6357  </sect2>
     
    7266      <seglistitem>
    7367        <seg>libhistory.[a,so], and libreadline.[a,so]</seg>
    74         <seg>/usr/include/readline, /usr/share/readline</seg>
     68        <seg>/usr/include/readline, /usr/share/doc/readline-&readline-version;, /usr/share/readline</seg>
    7569      </seglistitem>
    7670    </segmentedlist>
Note: See TracChangeset for help on using the changeset viewer.