From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Tue, 19 Jun 2007 11:55:36 +0000 (+0000)
Subject: Fixed problem with lang values not getting added to filenames as
X-Git-Tag: release/1.79.1~6^2~2146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c27ed879385749779f15b3d89087e2548f6828f5;p=docbook-dsssl

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 d0878f136..8fe7e5d67 100644
--- 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)"/>