Changeset 5e8edab5 for general/genlib/libassuan.xml

Timestamp:

05/24/2019 02:26:17 AM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

8eebfaa5

Parents:

215c728b

Message:

Merge to HEAD 21618.

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

File:

• general/genlib/libassuan.xml (modified) (2 diffs)

general/genlib/libassuan.xml

@@ -115 +115 @@
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to build documentation, you must have
-      <xref linkend="texlive"/> installed and issue the following commands:
+make                      &amp;&amp;
+
+make -C doc html                                                       &amp;&amp;
+makeinfo --html --no-split -o doc/assuan_nochunks.html doc/assuan.texi &amp;&amp;
+makeinfo --plaintext       -o doc/assuan.txt           doc/assuan.texi
+</userinput></screen>
+
+    <para>
+      The above commands build the documentation in html and plaintext formats.
+      If you wish to build alternate formats of the documentation, you must
+      have <xref linkend="texlive"/> installed and issue the following commands:
     </para>
 
 <!--<screen><userinput>patch -Np1 -i ../libassuan-&libassuan-version;-fix_doc_build-1.patch &amp;&amp;-->
-<screen><userinput>make -C doc pdf ps</userinput></screen>
+<screen remap="doc"><userinput>make -C doc pdf ps</userinput></screen>
 
     <para>
@@ -133 +139 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the documentation, install it by running the
-      following commands as the
+<screen role="root"><userinput>make install &amp;&amp;
+
+install -v -dm755   /usr/share/doc/libassuan-1.8.4/html &amp;&amp;
+install -v -m644 doc/assuan.html/* \
+                    /usr/share/doc/libassuan-1.8.4/html &amp;&amp;
+install -v -m644 doc/assuan_nochunks.html \
+                    /usr/share/doc/libassuan-1.8.4      &amp;&amp;
+install -v -m644 doc/assuan.{txt,texi} \
+                    /usr/share/doc/libassuan-1.8.4</userinput></screen>
+
+    <para>
+      If you built alternate formats of the documentation, install them by
+      running the following commands as the
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/libassuan-&libassuan-version; &amp;&amp;
-install -v -m644  doc/assuan.{pdf,ps,dvi} \
+<screen role="root"
+        remap="doc"><userinput>install -v -m644  doc/assuan.{pdf,ps,dvi} \
                   /usr/share/doc/libassuan-&libassuan-version;</userinput></screen>
   </sect2>