diff options
| author | Chris Staub <chris@linuxfromscratch.org> | 2014-06-29 06:37:09 +0000 |
|---|---|---|
| committer | Chris Staub <chris@linuxfromscratch.org> | 2014-06-29 06:37:09 +0000 |
| commit | b06fc9c7751555fa173124f96f2c6b8776fe3243 (patch) | |
| tree | 1f1b961a77e29f6f2fb6043694893a9fdee07e23 /chapter06 | |
| parent | cb1280a75e76c82dadbe4b880bd4d209438164cc (diff) | |
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
Diffstat (limited to 'chapter06')
| -rw-r--r-- | chapter06/gmp.xml | 27 | ||||
| -rw-r--r-- | chapter06/mpc.xml | 14 |
2 files changed, 25 insertions, 16 deletions
diff --git a/chapter06/gmp.xml b/chapter06/gmp.xml index 31c8e49ba..f10c283b5 100644 --- a/chapter06/gmp.xml +++ b/chapter06/gmp.xml @@ -52,7 +52,8 @@ <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> <title>The meaning of the new configure options:</title> @@ -64,11 +65,20 @@ </listitem> </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> <para>The test suite for GMP in this section is considered critical. @@ -84,15 +94,10 @@ <screen><userinput remap="test">awk '/tests passed/{total+=$2} ; END{print total}' gmp-check-log</userinput></screen> - <para>Install the package:</para> - -<screen><userinput remap="install">make install</userinput></screen> - - <para>If desired, install the documentation:</para> + <para>Install the package and its 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> diff --git a/chapter06/mpc.xml b/chapter06/mpc.xml index 511ec7cfe..a8b8818dc 100644 --- a/chapter06/mpc.xml +++ b/chapter06/mpc.xml @@ -44,19 +44,21 @@ <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> <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> @@ -66,9 +68,11 @@ <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> |