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

[fperrad at svn.parrot.org]

Author: fperrad
Date: Mon Apr 20 22:15:54 2009
New Revision: 38239
URL: https://trac.parrot.org/parrot/changeset/38239

Log:
[doc] revert patch from TT #555 (he)

perldoc detection broken on Windows XP with Strawberry Perl 5.10.0

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

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

Modified: trunk/config/gen/makefiles/docs.in
==============================================================================
--- trunk/config/gen/makefiles/docs.in	Mon Apr 20 22:12:48 2009	(r38238)
+++ trunk/config/gen/makefiles/docs.in	Mon Apr 20 22:15:54 2009	(r38239)
@@ -37,7 +37,7 @@
 	$(MKPATH) ops
 
 packfile-c.pod: ../src/packfile.c
-#IF(new_perldoc):	$(PERLDOC) -u ../src/packfile.c > packfile-c.pod
+#IF(new_perldoc):	$(PERLDOC) -ud packfile-c.pod ../src/packfile.c
 #ELSE:	$(PERLDOC) -u ../src/packfile.c > packfile-c.pod
 
 clean: