fix chm build (allmodules.xml is no longer included directly)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103998 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/style/xsl/hhc.xsl b/docs/manual/style/xsl/hhc.xsl
index c14dc921255dcdf5b02fc43f58032687e89c9061..ff1b02cef12b845c2f9eb12e01efdffa9b411c04 100644 (file)
--- a/docs/manual/style/xsl/hhc.xsl
+++ b/docs/manual/style/xsl/hhc.xsl
@@ -115,7 +115,9 @@
 
         &ul.start; &lf;&tab;
             <xsl:apply-templates select="page" />
-            <xsl:apply-templates select="modulefilelist" />
+            <xsl:if test="@id = 'modules'">
+                <xsl:apply-templates select="document($allmodules)/modulefilelist" />
+            </xsl:if>
         &ul.end; &lf;
         &li.end; &lf;&tab;
     </xsl:for-each>&lf;
@@ -244,7 +246,7 @@
 <!-- category/modulefilelist                                              -->
 <!-- process all listed module files                                      -->
 <!-- ==================================================================== -->
-<xsl:template match="category/modulefilelist">
+<xsl:template match="modulefilelist">
 <!-- create a module name translation list for sorting -->
 <xsl:variable name="translist">
     <xsl:text>-</xsl:text>

diff --git a/docs/manual/style/xsl/hhp.xsl b/docs/manual/style/xsl/hhp.xsl
index f273b8036087696f58f39b819cc628e3e09e4f13..4560cb67692655cec2dee48cbfeda2b4a7efebb5 100644 (file)
--- a/docs/manual/style/xsl/hhp.xsl
+++ b/docs/manual/style/xsl/hhp.xsl
@@ -145,7 +145,10 @@
 <!-- and now all sitemap-listed files -->
 <xsl:for-each select="category">
     <xsl:apply-templates select="page[@href]" />
-    <xsl:apply-templates select="modulefilelist/modulefile"/>
+    <xsl:if test="@id = 'modules'">
+        <xsl:apply-templates select="document($allmodules)/modulefilelist
+                                     /modulefile" />
+    </xsl:if>
 </xsl:for-each>&lf;
 </xsl:template>
 <!-- /sitemap -->
@@ -180,7 +183,7 @@
 <!-- ==================================================================== -->
 <!-- list module files                                                    -->
 <!-- ==================================================================== -->
-<xsl:template match="category/modulefilelist/modulefile">
+<xsl:template match="modulefilelist/modulefile">
 <xsl:text>mod\</xsl:text>
 <xsl:value-of select="substring-before(normalize-space(.), '.xml')" />
 <xsl:text>.html</xsl:text>&lf;