Changeset c873165 for BOOK/final-system/common

Timestamp:

Apr 8, 2014, 7:00:20 PM (11 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

906f724

Parents:

ce32b58

Message:

Install documentation with versioned directory and add/update installed directories.

Location:

BOOK/final-system/common

Files:

• automake.xml (modified) (1 diff)
• dbus.xml (modified) (2 diffs)
• flex.xml (modified) (2 diffs)
• gawk.xml (modified) (2 diffs)
• gettext.xml (modified) (2 diffs)
• gmp.xml (modified) (2 diffs)
• iproute2.xml (modified) (2 diffs)
• kbd.xml (modified) (2 diffs)
• mpfr.xml (modified) (2 diffs)
• readline.xml (modified) (2 diffs)
• sed.xml (modified) (2 diffs)
• tar.xml (modified) (2 diffs)
• util-linux.xml (modified) (2 diffs)
• xz.xml (modified) (2 diffs)

BOOK/final-system/common/automake.xml

@@ -28 +28 @@
     <para os="a">Prepare Automake for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>

BOOK/final-system/common/dbus.xml

@@ -30 +30 @@
 <screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/dbus-1.0 --localstatedir=/var \
-    --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+    --with-systemdsystemunitdir=/lib/systemd/system \
+    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -70 +71 @@
         <seg>libdbus-1.[a,so]</seg>
         <seg>/etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0,
-        /var/lib/dbus</seg>
+        /usr/share/doc/dbus-&dbus-version;, /var/lib/dbus</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/flex.xml

@@ -28 +28 @@
     <para os="a">Prepare Flex for compilation:</para>
 
-<screen os="b"><userinput>M4=m4 ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>M4=m4 ./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -66 +66 @@
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>flex, flex++, and lex</seg>
         <seg>libfl.[a,so] and libfl_pic.[a,so]</seg>
+        <seg>/usr/share/doc/flex-&flex-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/gawk.xml

@@ -42 +42 @@
 <screen os="g"><userinput>make install</userinput></screen>
 
+    <para os="h">Install the documentation:</para>
+
+<screen os="i"><userinput>mkdir -v /usr/share/doc/gawk-&gawk-version;
+cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen>
+
   </sect2>
 
@@ -54 +59 @@
         <seg>awk (link to gawk), gawk, gawk-&gawk-version;, grcat, igawk,
         pgawk, pgawk-&gawk-version;, and pwcat</seg>
-        <seg>/usr/lib/awk, /usr/lib/gawk, /usr/share/awk</seg>
+        <seg>/usr/lib/awk, /usr/lib/gawk, /usr/share/awk,
+        /usr/share/doc/gawk-&gawk-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/gettext.xml

@@ -30 +30 @@
     <para os="a">Prepare Gettext for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -61 +61 @@
         <seg>libasprintf.[a,so], libgettextlib.so, libgettextpo.[a,so],
         libgettextsrc.so, and preloadable_libintl.so</seg>
-        <seg>/usr/lib/gettext, /usr/share/doc/gettext, /usr/share/gettext</seg>
+        <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
+        /usr/share/gettext</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/gmp.xml

@@ -70 +70 @@
 <screen os="i"><userinput>make install</userinput></screen>
 
+    <para os="j">Install the documentation:</para>
+
+<screen os="k"><userinput>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>
+
   </sect2>
 
@@ -77 +83 @@
     <segmentedlist>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>libgmp.[a,so], libgmpxx.[a,so]</seg>
+        <seg>/usr/share/doc/gmp-&gmp-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/iproute2.xml

@@ -44 +44 @@
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
+<screen os="b"><userinput>make DESTDIR= \
+    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
     MANDIR=/usr/share/man</userinput></screen>
 
@@ -92 +93 @@
         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
         and tc</seg>
-        <seg>/etc/iproute2, /usr/lib/tc, /usr/share/doc/iproute2</seg>
+        <seg>/etc/iproute2, /usr/lib/tc,
+        /usr/share/doc/iproute2-&iproute2-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/kbd.xml

@@ -46 +46 @@
 
 <screen os="i"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
+
+    <para os="j">Install the documentation:</para>
+
+<screen os="k"><userinput>mkdir -v /usr/share/doc/kbd-&kbd-version;
+cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
 
   </sect2>
@@ -64 +69 @@
         unicode_start, and unicode_stop</seg>
         <seg>/usr/share/consolefonts, /usr/share/consoletrans,
+        /usr/share/doc/kbd-&kbd-version;,
         /usr/share/keymaps, /usr/share/unimaps</seg>
       </seglistitem>

BOOK/final-system/common/mpfr.xml

@@ -34 +34 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ./configure --prefix=/usr --with-gmp=/usr</userinput></screen>
+  ./configure --prefix=/usr --with-gmp=/usr
+  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -64 +65 @@
       <seglistitem>
         <seg>libmpfr.[a,so]</seg>
-        <seg>/usr/share/doc/mpfr</seg>
+        <seg>/usr/share/doc/mpfr-&mpfr-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/readline.xml

@@ -43 +43 @@
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make htmldir=/usr/share/doc/readline install</userinput></screen>
+<screen os="g"><userinput>make htmldir=/usr/share/doc/readline-&readline-version; install</userinput></screen>
 
     <para os="h">Now move the static libraries to a more appropriate location:</para>
@@ -66 +66 @@
       <seglistitem>
         <seg>libhistory.[a,so], and libreadline.[a,so]</seg>
-        <seg>/usr/include/readline, /usr/share/doc/readline, /usr/share/readline</seg>
+        <seg>/usr/include/readline, /usr/share/doc/readline-&readline-version;, /usr/share/readline</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/sed.xml

@@ -27 +27 @@
     <para os="a">Prepare Sed for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
+    --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -60 +61 @@
       <seglistitem>
         <seg>sed</seg>
-        <seg>/usr/share/doc/sed</seg>
+        <seg>/usr/share/doc/sed-&sed-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/tar.xml

@@ -51 +51 @@
 <screen os="i"><userinput>perl tarman > /usr/share/man/man1/tar.1</userinput></screen>
 
+    <para os="j">Install the documentation:</para>
+
+<screen os="k"><userinput>make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></screen>
+
   </sect2>
 
@@ -58 +62 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>rmt and tar</seg>
+        <seg>/usr/share/doc/tar-&tar-version;</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/common/util-linux.xml

@@ -51 +51 @@
     <para os="a">Prepare Util-linux for compilation:</para>
 
-<screen os="b"><userinput>./configure --enable-write</userinput></screen>
+<screen os="b"><userinput>./configure --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <variablelist os="c">
@@ -104 +104 @@
         <seg>libblkid.[a,so], libmount.[a,so], and libuuid.[a,so]</seg>
         <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
-        /usr/share/bash-completion, /usr/share/doc/util-linux/getopt,
+        /usr/share/bash-completion,
+        /usr/share/doc/util-linux-&util-linux-version;/getopt,
         /var/lib/hwclock</seg>
       </seglistitem>

BOOK/final-system/common/xz.xml

@@ -30 +30 @@
     <para os="a">Prepare XZ Utils for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -74 +74 @@
         and xzmore</seg>
         <seg>liblzma.[a,so]</seg>
-        <seg>/usr/include/lzma, /usr/share/doc/xz</seg>
+        <seg>/usr/include/lzma, /usr/share/doc/xz-&xz-version;</seg>
       </seglistitem>
     </segmentedlist>