Fixed problem with lang values not getting added to filenames as

expected for all cases. Closes #1674564. Thanks to Daniel Leidert
for reporting.

diff --git a/xsl/manpages/utility.xsl b/xsl/manpages/utility.xsl
index d0878f136710fdb8b51f01a181dff42c0f2fbecc..8fe7e5d67d620e3b7b43bf1cb339e7a8a9082be5 100644 (file)
--- a/xsl/manpages/utility.xsl
+++ b/xsl/manpages/utility.xsl
@@ -364,9 +364,10 @@
     <xsl:param name="name.with.lang">
       <xsl:choose>
         <xsl:when test="not($man.output.lang.in.name.enabled = 0)
-                        and ($man.output.subdirs.enabled = 0)">
+          and ($man.output.subdirs.enabled = 0 or
+          $man.output.in.separate.dir = 0)">
           <!-- * user has specified man.output.lang.in.name.enabled -->
-          <!-- * AND doesn't want output going into separate manN dirs, -->
+          <!-- * AND doesn't want output going into separate dirs, -->
           <!-- * so we include the $lang value in the filename; e.g., -->
           <!-- * foo.ja.1 -->
           <xsl:value-of select="concat($name, '.', $lang)"/>