From: Mike Taylor <mike@indexdata.com>
Date: Wed, 1 Nov 2006 10:11:01 +0000 (+0000)
Subject: Fix to work with recently changed library directory specification.
X-Git-Tag: CPAN-v1.02~855
X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=d78f8a09255799fe9376f57e611e1f2ea829ba97;p=irspy-moved-to-github.git

Fix to work with recently changed library directory specification.
The setting of PERL5LIB in the Apache configuration meant that
layout.mc no longer set the global LIBDIR, so now we fetch the
IRSpyLibDir configuration manually.  Much cleaner.
---

diff --git a/web/htdocs/details/doc.mc b/web/htdocs/details/doc.mc
index 8d71d8a..beae59c 100644
--- a/web/htdocs/details/doc.mc
+++ b/web/htdocs/details/doc.mc
@@ -1,20 +1,21 @@
-%# $Id: doc.mc,v 1.1 2006-09-28 16:48:20 mike Exp $
+%# $Id: doc.mc,v 1.2 2006-11-01 10:11:01 mike Exp $
 <%once>
 use Pod::Html;
 use IO::Dir;
 </%once>
 <%perl>
+my $libdir = $r->dir_config("IRSpyLibDir");
 my $module = $r->param("module");
 if (!defined $module) {
     print "     <ul>\n";
-    render_doc_links($LIBDIR, "ZOOM", 6);
+    render_doc_links($libdir, "ZOOM", 6);
     print "     </ul>\n";
 } else {
     print "<b>Documentation for '$module'</b>\n";
     { my $dir = "/tmp/pod2html"; mkdir $dir; chdir $dir || die $!; }
     # For some reason, output to standard output doesn't appear
     my $name = "ZOOM.html";
-    pod2html("$LIBDIR/$module", "--outfile=$name");
+    pod2html("$libdir/$module", "--outfile=$name");
     open F, "<$name" or die "can't open '$name': $!";
     my $text = join("", <F>);
     close F;