Change 14317 by jhi@alpha on 2002/01/17 22:39:48

        The #14300 broke hints file handling.

Affected files ...

.... //depot/perl/lib/ExtUtils/MakeMaker.pm#78 edit

Differences ...

==== //depot/perl/lib/ExtUtils/MakeMaker.pm#78 (text) ====
Index: perl/lib/ExtUtils/MakeMaker.pm
--- perl/lib/ExtUtils/MakeMaker.pm.~1~  Thu Jan 17 15:45:05 2002
+++ perl/lib/ExtUtils/MakeMaker.pm      Thu Jan 17 15:45:05 2002
@@ -163,9 +163,20 @@
 sub eval_in_x {
     my($self,$dir) = @_;
     package main;
-    chdir $dir or Carp::carp("Couldn't change to directory $dir: $!");
+    chdir $dir or
+       Carp::carp("Couldn't change to directory $dir: $!");
+
+    {
+       local *FH;
+       open(FH,"Makefile.PL") or
+           Carp::carp("Couldn't open Makefile.PL in $dir");
+       local $/; # Sluuurp.
+       my $eval = join "", <FH>;
+       close FH;
+       # eval, not do, since we need lexical variables
+       eval $eval;
+    }
 
-    eval { do './Makefile.PL' };
     if ($@) {
 #        if ($@ =~ /prerequisites/) {
 #            die "MakeMaker WARNING: $@";
End of Patch.

Reply via email to