Changeset 5ca26c7 for general


Ignore:
Timestamp:
08/17/2014 12:55:00 PM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
systemd-11177
Children:
ad6595b1
Parents:
c1a9078
Message:

Merged trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13932 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
general/prog
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • general/prog/cmake-systemd.xml

    rc1a9078 r5ca26c7  
    122122      <command>bin/ctest -R "problem1-test"</command> and, to omit it, use
    123123      <command>bin/ctest -E "problem1-test"</command>. These options can be
    124       used toghether:
     124      used together:
    125125      <command>bin/ctest -R "problem1-test" -E "problem2-test"</command>.
    126126      Option -N can be used to display all available tests, and you can run

  • general/prog/gcc-ada.xml

    rc1a9078 r5ca26c7  
    4545
    4646    <para>The compiler and associated tools on this page are known as the
    47     <application>GNAT</application> technology, developped by the Adacore
     47    <application>GNAT</application> technology, developed by the Adacore
    4848    company, using the <application>GCC</application> backend. Since
    4949    parts of the Ada compiler are written in Ada, there is a circular

  • general/prog/git.xml

    rc1a9078 r5ca26c7  
    99  <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
    1010  <!ENTITY git-download-ftp  "ftp://ftp.kernel.org/pub/software/scm/git/git-&git-version;.tar.xz">
    11   <!ENTITY git-md5sum        "0caa9c54bb04612062d21823163ecb13">
    12   <!ENTITY git-size          "3.3 MB">
    13   <!ENTITY git-buildsize     "269 MB (additional 13 MB for downloaded docs and man pages, or 24 MB building docs and man pages)">
    14   <!ENTITY git-time          "0.7 SBU (additional 5.5 SBU for tests or 2.5 SBU for docs and man build)
    15 ">
     11  <!ENTITY git-md5sum        "47b1f55d9a16be112f7ae2c778a9b30c">
     12  <!ENTITY git-size          "3.4 MB">
     13  <!ENTITY git-buildsize     "208 MB (additional 14 MB for downloaded docs and man pages, or 27 MB building docs and man pages)">
     14  <!ENTITY git-time          " 0.7 SBU (additional 9.6 SBU for tests or 2.8 SBU for docs and man build)">
    1615]>
    1716
    … …  
    145144
    146145    <para>
     146      You can build the man pages and/or html docs, or
     147      use downloaded ones. If you choose to build them, use next two following
     148      instructions.
     149    </para>
     150
     151    <para>
    147152      If you have installed <ulink
    148153      url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> you can
    … …  
    171176<screen role="root"><userinput>make install</userinput></screen>
    172177
    173     <para>
    174       If you created the man pages, install them as the
     178<!-- ==== Method 1 for docs ====== -->
     179    <bridgehead renderas="sect3">If you created the man pages and/or html docs</bridgehead>
     180
     181    <para>
     182      Install the man pages as
    175183      <systemitem class="username">root</systemitem> user:
    176184    </para>
    … …  
    179187
    180188    <para>
    181       If you created the html docs, install them as the
     189      Install the html docs as
    182190      <systemitem class="username">root</systemitem> user:
    183191    </para>
    184192
    185 <screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html              &amp;&amp;
    186 mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text}         &amp;&amp;
    187 mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
    188 mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &amp;&amp;
    189 mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &amp;&amp;
    190 mv       /usr/share/doc/git-&git-version;/technical/{*.txt,text}        &amp;&amp;
    191 mv       /usr/share/doc/git-&git-version;/technical/{*.,}html           &amp;&amp;
    192 mkdir    /usr/share/doc/git-&git-version;/howto/{html,text}             &amp;&amp;
    193 mv       /usr/share/doc/git-&git-version;/howto/{*.txt,text}            &amp;&amp;
    194 mv       /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput></screen>
    195 
    196     <para>
    197       Alternatively, If you downloaded the man pages untar them as the
     193<screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
     194
     195<!-- ==== Method 2 for docs ====== -->
     196    <bridgehead renderas="sect3">If you downloaded the man pages and/or html docs</bridgehead>
     197
     198    <para>
     199      If you downloaded the man pages untar them as the
    198200      <systemitem class="username">root</systemitem> user:
    199201    </para>
    … …  
    212214
    213215find /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} \;     &amp;&amp;
    214 find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;     &amp;&amp;
    215 
    216 mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
     216find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;</userinput></screen>
     217
     218<!-- ==== Reorganize docs ====== -->
     219    <bridgehead renderas="sect3">Reorganize man pages and/or html docs (both methods)</bridgehead>
     220
     221    <para>
     222      For both methods, reorganize the files, as
     223      <systemitem class="username">root</systemitem> user:
     224    </para>
     225
     226<screen role="root"><userinput>mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
    217227mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &amp;&amp;
    218228mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &amp;&amp;
    … …  
    267277      permissions in the shipped documentation tar file.
    268278    </para>
    269 
    270     <para><option>--libexecdir=/usr/lib</option>: This option puts the
    271     <filename class="directory">git-core</filename> directory in
    272     <filename class="directory">/usr/lib</filename> instead of
    273     <filename class="directory">/usr/libexec</filename> in accordance
    274     with the old version of the FHS used before LFS-7.5.</para>
    275279
    276280  </sect2>

  • general/prog/subversion.xml

    rc1a9078 r5ca26c7  
    1010  "http://www.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
    1111  <!ENTITY subversion-download-ftp  " ">
    12   <!ENTITY subversion-md5sum        "bd495517a760ddd764ce449a891971db">
     12  <!ENTITY subversion-md5sum        "3068256761b40863df96128834d6b71b">
    1313  <!ENTITY subversion-size          "6.6 MB">
    14   <!ENTITY subversion-buildsize     "147 MB  (284 MB with all bindings and API documentation built; additional 968 MB for tests)">
    15   <!ENTITY subversion-time          "1.3 SBU (2.5 SBU with all bindings and API documentation built; additional 12.6 SBU for tests)">
     14  <!ENTITY subversion-buildsize     "143 MB  (284 MB with all bindings and API documentation built; additional 968 MB for tests)">
     15  <!ENTITY subversion-time          "0.9 SBU (2.5 SBU with all bindings and API documentation built; additional 12.6 SBU for tests)">
    1616]>
    1717
Note: See TracChangeset for help on using the changeset viewer.