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 3fe656c8eb18f0b671bd24c280fe75c9ef58be7d..fca9781b110328be271c4886546431c404908121 100644 (file)
--- 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>