From: Bob Stayton <bobs@sagehill.net>
Date: Fri, 10 Jan 2014 20:22:21 +0000 (+0000)
Subject: Fixed bug #1313 where write.stubs template mistakenly includes
X-Git-Tag: release/1.79.1~6^2~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=701666829b3a47eb3b12f092fdd738674045f0c6;p=docbook-dsssl

Fixed bug #1313 where write.stubs template mistakenly includes
$man.output.base.dir in the .so address.
---

diff --git a/xsl/manpages/other.xsl b/xsl/manpages/other.xsl
index 3fe656c8e..fca9781b1 100644
--- a/xsl/manpages/other.xsl
+++ b/xsl/manpages/other.xsl
@@ -604,11 +604,22 @@ manvolnum
           <xsl:with-param name="message-epilog"> (soelim stub)</xsl:with-param>
           <xsl:with-param name="content">
             <xsl:value-of select="'.so '"/>
-            <xsl:call-template name="make.adjusted.man.filename">
-              <xsl:with-param name="name" select="$first.refname"/>
-              <xsl:with-param name="section" select="$section"/>
-              <xsl:with-param name="lang" select="$lang"/>
-            </xsl:call-template>
+            <xsl:variable name="full.filename">
+              <xsl:call-template name="make.adjusted.man.filename">
+                <xsl:with-param name="name" select="$first.refname"/>
+                <xsl:with-param name="section" select="$section"/>
+                <xsl:with-param name="lang" select="$lang"/>
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:choose>
+              <xsl:when test="starts-with($full.filename, $man.output.base.dir)">
+                <xsl:value-of 
+                   select="substring-after($full.filename,$man.output.base.dir)"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="$full.filename"/>
+              </xsl:otherwise>
+            </xsl:choose>
             <xsl:text>&#10;</xsl:text>
           </xsl:with-param>
         </xsl:call-template>