Changeset e9e0e8a1 for general/prog/git.xml

Timestamp:

08/17/2014 12:55:00 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485

Children:

261e4fe4

Parents:

2543d1b7

Message:

Merged trunk.

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

File:

• general/prog/git.xml (modified) (6 diffs)

general/prog/git.xml

@@ -9 +9 @@
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  "ftp://ftp.kernel.org/pub/software/scm/git/git-&git-version;.tar.xz">
-  <!ENTITY git-md5sum        "0caa9c54bb04612062d21823163ecb13">
-  <!ENTITY git-size          "3.3 MB">
-  <!ENTITY git-buildsize     "269 MB (additional 13 MB for downloaded docs and man pages, or 24 MB building docs and man pages)">
-  <!ENTITY git-time          "0.7 SBU (additional 5.5 SBU for tests or 2.5 SBU for docs and man build)
-">
+  <!ENTITY git-md5sum        "47b1f55d9a16be112f7ae2c778a9b30c">
+  <!ENTITY git-size          "3.4 MB">
+  <!ENTITY git-buildsize     "208 MB (additional 14 MB for downloaded docs and man pages, or 27 MB building docs and man pages)">
+  <!ENTITY git-time          " 0.7 SBU (additional 9.6 SBU for tests or 2.8 SBU for docs and man build)">
 ]>
 
@@ -145 +144 @@
 
     <para>
+      You can build the man pages and/or html docs, or
+      use downloaded ones. If you choose to build them, use next two following
+      instructions.
+    </para>
+
+    <para>
       If you have installed <ulink
       url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> you can
@@ -171 +176 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>
-      If you created the man pages, install them as the
+<!-- ==== Method 1 for docs ====== -->
+    <bridgehead renderas="sect3">If you created the man pages and/or html docs</bridgehead>
+
+    <para>
+      Install the man pages as
       <systemitem class="username">root</systemitem> user:
     </para>
@@ -179 +187 @@
 
     <para>
-      If you created the html docs, install them as the
+      Install the html docs as
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html              &amp;&amp;
-mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text}         &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &amp;&amp;
-mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/technical/{*.txt,text}        &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/technical/{*.,}html           &amp;&amp;
-mkdir    /usr/share/doc/git-&git-version;/howto/{html,text}             &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/howto/{*.txt,text}            &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput></screen>
-
-    <para>
-      Alternatively, If you downloaded the man pages untar them as the
+<screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
+
+<!-- ==== Method 2 for docs ====== -->
+    <bridgehead renderas="sect3">If you downloaded the man pages and/or html docs</bridgehead>
+
+    <para>
+      If you downloaded the man pages untar them as the
       <systemitem class="username">root</systemitem> user:
     </para>
@@ -212 +214 @@
 
 find /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} \;     &amp;&amp;
-find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;     &amp;&amp;
-
-mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
+find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;</userinput></screen>
+
+<!-- ==== Reorganize docs ====== -->
+    <bridgehead renderas="sect3">Reorganize man pages and/or html docs (both methods)</bridgehead>
+
+    <para>
+      For both methods, reorganize the files, as
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
 mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &amp;&amp;
 mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &amp;&amp;
@@ -267 +277 @@
       permissions in the shipped documentation tar file.
     </para>
-
-    <para><option>--libexecdir=/usr/lib</option>: This option puts the
-    <filename class="directory">git-core</filename> directory in
-    <filename class="directory">/usr/lib</filename> instead of
-    <filename class="directory">/usr/libexec</filename> in accordance
-    with the old version of the FHS used before LFS-7.5.</para>
 
   </sect2>