[svn:parrot] r38214 - in trunk/config: auto gen/makefiles

[Infinoid at svn.parrot.org]

Author: Infinoid
Date: Sun Apr 19 22:05:04 2009
New Revision: 38214
URL: https://trac.parrot.org/parrot/changeset/38214

Log:
[doc] Apply patches from he++ in TT #555, to allow Configure.pl to detect perldoc when run as root.

Modified:
   trunk/config/auto/perldoc.pm
   trunk/config/gen/makefiles/docs.in

Modified: trunk/config/auto/perldoc.pm
==============================================================================
--- trunk/config/auto/perldoc.pm	Sun Apr 19 21:42:47 2009	(r38213)
+++ trunk/config/auto/perldoc.pm	Sun Apr 19 22:05:04 2009	(r38214)
@@ -38,7 +38,9 @@
 
     my $cmd = $conf->data->get_p5('scriptdirexp') . q{/perldoc};
     my ( $fh, $filename ) = tempfile( UNLINK => 1 );
-    my $content = capture_output("$cmd -ud $filename perldoc") || undef;
+    my($stdout, $stderr, $retval) = 
+	capture_output("$cmd -u perldoc > $filename");
+    my($content) = $retval ? undef : $stderr;
 
     return 1 unless defined( $self->_initial_content_check($conf, $content) );
 
@@ -68,7 +70,7 @@
         if ( $new_perldoc ) {
             $TEMP_pod_build .= <<"END"
 ops$slash$pod: ..${slash}src${slash}ops${slash}$ops
-\t\$(PERLDOC) -ud ops${slash}$pod ..${slash}src${slash}ops${slash}$ops
+\t\$(PERLDOC) -u ..${slash}src${slash}ops${slash}$ops > ops${slash}$pod 
 \t\$(CHMOD) 0644 ops${slash}$pod
 
 END

Modified: trunk/config/gen/makefiles/docs.in
==============================================================================
--- trunk/config/gen/makefiles/docs.in	Sun Apr 19 21:42:47 2009	(r38213)
+++ trunk/config/gen/makefiles/docs.in	Sun Apr 19 22:05:04 2009	(r38214)
@@ -37,7 +37,7 @@
 	$(MKPATH) ops
 
 packfile-c.pod: ../src/packfile.c
-#IF(new_perldoc):	$(PERLDOC) -ud packfile-c.pod ../src/packfile.c
+#IF(new_perldoc):	$(PERLDOC) -u ../src/packfile.c > packfile-c.pod 
 #ELSE:	$(PERLDOC) -u ../src/packfile.c > packfile-c.pod
 
 clean: