Author: infinoid
Date: Fri Mar 21 13:24:58 2008
New Revision: 26513

Modified:
   trunk/config/auto/perldoc.pm
   trunk/config/init/defaults.pm

Log:
[config] perldoc check should use $Config{scriptdirexp}, not $Config{scriptdir}.
The "scriptdir" value from p5 is sometimes interpreted in strange ways, but
the "scriptdirexp" value is expanded at compile-time, so it's guaranteed to be
sane.

Grep perl-5.10.0's perldelta.pod for "Relocatable installations" for details.
This was preventing "perldoc" from being detected properly on a local install
of perl.  wolverian++ for reporting it.


Modified: trunk/config/auto/perldoc.pm
==============================================================================
--- trunk/config/auto/perldoc.pm        (original)
+++ trunk/config/auto/perldoc.pm        Fri Mar 21 13:24:58 2008
@@ -36,7 +36,7 @@
 sub runstep {
     my ( $self, $conf ) = @_;
 
-    my $cmd = $conf->data->get_p5('scriptdir') . q{/perldoc};
+    my $cmd = $conf->data->get_p5('scriptdirexp') . q{/perldoc};
     my $tmpfile = q{c99da7c4.tmp};
     my $content = capture_output("$cmd -ud $tmpfile perldoc") || undef;
 

Modified: trunk/config/init/defaults.pm
==============================================================================
--- trunk/config/init/defaults.pm       (original)
+++ trunk/config/init/defaults.pm       Fri Mar 21 13:24:58 2008
@@ -56,7 +56,7 @@
         longsize
         optimize
         sig_name
-        scriptdir
+        scriptdirexp
         use64bitint
     | ) {
         $conf->data->set_p5( $orig => $Config{$orig} );

Reply via email to