Changeset aaf26b3

Timestamp:

08/20/2024 12:05:01 PM (3 weeks ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/for-12.3

Parents:

c84b816d

Message:

fontconfig: Don't make doc installation over-complex

Even without --disable-docs, make should guarantee not to invoke the
optional dependencies to regenerate the existing docs (otherwise you
have a broken timestamp and we don't support such a breakage).

File:

• general/graphlib/fontconfig.xml (modified) (3 diffs)

general/graphlib/fontconfig.xml

@@ -92 +92 @@
       (both used by some tests for downloading and extracting test files),
       <xref linkend="json-c"/>,
-      <xref linkend="docbook-utils"/> and
+    </para>
+
+    <bridgehead renderas="sect4">Optional for regenerating the documentation</bridgehead>
+    <para>
+      These dependencies are only used if you've modified some files in
+      the <filename class='directory'>doc</filename> directory in the source
+      code tree:
+      <xref linkend="docbook-utils"/>,
       <xref linkend="libxml2"/>,
+      <xref linkend="perl-sgmlspm"/>, and
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
     </para>
 
     &test-use-internet;
-
-    <note>
-      <para>
-        If you have <application>DocBook Utils</application> installed and
-        you remove the <parameter>--disable-docs</parameter> parameter from
-        the <command>configure</command> command below, you must have
-        <xref linkend="perl-sgmlspm"/> and <xref linkend="texlive"/> installed
-        also, or the <application>Fontconfig</application> build will fail.
-      </para>
-    </note>
 
   </sect2>
@@ -122 +120 @@
             --sysconfdir=/etc    \
             --localstatedir=/var \
-            --disable-docs       \
             --docdir=/usr/share/doc/fontconfig-&fontconfig-version; &amp;&amp;
 make</userinput></screen>
@@ -137 +134 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you did not remove the <parameter>--disable-docs</parameter>
-      parameter from the <command>configure</command> command, you can install
-      the pre-generated documentation by using the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 \
-        /usr/share/{man/man{1,3,5},doc/fontconfig-&fontconfig-version;/fontconfig-devel} &amp;&amp;
-install -v -m644 fc-*/*.1         /usr/share/man/man1 &amp;&amp;
-install -v -m644 doc/*.3          /usr/share/man/man3 &amp;&amp;
-install -v -m644 doc/fonts-conf.5 /usr/share/man/man5 &amp;&amp;
-install -v -m644 doc/fontconfig-devel/* \
-                                  /usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-devel &amp;&amp;
-install -v -m644 doc/*.{pdf,sgml,txt,html} \
-                                  /usr/share/doc/fontconfig-&fontconfig-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-docs</parameter>: This switch avoids building the
-      documentation (the release tarball includes pre-generated
-      documentation).
-    </para>
 
   </sect2>