Changeset b06fc9c

Timestamp:

06/29/2014 06:37:09 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

87ae993

Parents:

cb1280a

Message:

Add documentation installation commands for MPC, and update commands for GMP

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10590 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/gmp.xml (modified) (3 diffs)
• chapter06/mpc.xml (modified) (3 diffs)

chapter01/changelog.xml

@@ -50 +50 @@
           <para>[Chris] - Various text updates.
           Fixes <ulink url="&lfs-ticket-root;3622">#3622</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Changed GMP instructions to generate and install
+          HTML documentation from the Makefile rather than manually copying
+          files, and added doc installation instructions for MPC.
+          Fixes <ulink url="&lfs-ticket-root;3618">#3618</ulink>.</para>
         </listitem>
       </itemizedlist>

chapter06/gmp.xml

@@ -53 +53 @@
     <para>Prepare GMP for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --enable-cxx</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --enable-cxx \
+    --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
 
     <variablelist>
@@ -65 +66 @@
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--docdir=/usr/share/doc-gmp&gmp-version;</parameter></term>
+        <listitem>
+          <para>This variable specifies the correct place for the
+          documentation.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
-    <para>Compile the package:</para>
+    <para>Compile the package and generate the HTML documentation:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make
+make html</userinput></screen>
 
     <important>
@@ -85 +95 @@
 <screen><userinput remap="test">awk '/tests passed/{total+=$2} ; END{print total}' gmp-check-log</userinput></screen>
 
-    <para>Install the package:</para>
+    <para>Install the package and its documentation:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
-
-    <para>If desired, install the documentation:</para>
-
-<screen><userinput remap="install">mkdir -v /usr/share/doc/gmp-&gmp-version;
-cp    -v doc/{isa_abi_headache,configuration} doc/*.html \
-         /usr/share/doc/gmp-&gmp-version;</userinput></screen>
+<screen><userinput remap="install">make install
+make install-html</userinput></screen>
 
   </sect2>

chapter06/mpc.xml

@@ -45 +45 @@
     <para>Prepare MPC for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/mpc-&mpc-version;</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para>Compile the package and generate the HTML documentation:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make
+make html</userinput></screen>
 
     <para>To test the results, issue:</para>
@@ -55 +56 @@
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>Install the package:</para>
+    <para>Install the package and its documentation:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make install
+make install-html</userinput></screen>
 
   </sect2>
@@ -67 +69 @@
     <segmentedlist>
       <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>libmpc.{a,so}</seg>
+        <seg>/usr/share/doc/mpc-&mpc-version;</seg>
       </seglistitem>
     </segmentedlist>