Document CvGV

[perl5.git] / make_ext.pl

diff --git a/make_ext.pl b/make_ext.pl
index b963063..ce3debd 100644 (file)
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -168,7 +168,7 @@ if (IS_WIN32) {
     $ENV{PATH} = "$topdir;$topdir\\win32\\bin;$ENV{PATH}";
     my $pl2bat = "$topdir\\win32\\bin\\pl2bat";
     unless (-f "$pl2bat.bat") {
-       my @args = ($perl, "-I$topdir\\lib", ("$pl2bat.pl") x 2);
+       my @args = ($perl, "-I$topdir\\lib", "-I$topdir\\cpan\\ExtUtils-PL2Bat\\lib", ("$pl2bat.pl") x 2);
        print "@args\n" if $verbose;
        system(@args) unless IS_CROSS;
     }
@@ -217,18 +217,21 @@ elsif (IS_VMS) {
 
 { # XXX hack for dependency ordering
     # Cwd needs to be built before Encode recurses into subdirectories.
-    # Pod::Simple needs to be built before Pod::Functions
+    # Pod::Simple needs to be built before Pod::Functions, but after 'if'
     # lib needs to be built before IO-Compress
     # This seems to be the simplest way to ensure this ordering:
-    my (@first, @other);
+    my (@first, @second, @other);
     foreach (@extspec) {
-       if ($_ eq 'Cwd' || $_ eq 'Pod/Simple' || $_ eq 'lib') {
+       if ($_ eq 'Cwd' || $_ eq 'if' || $_ eq 'lib') {
            push @first, $_;
+        }
+       elsif ($_ eq 'Pod/Simple') {
+           push @second, $_;
        } else {
            push @other, $_;
        }
     }
-    @extspec = (@first, @other);
+    @extspec = (@first, @second, @other);
 }
 
 if ($Config{osname} eq 'catamount' and @extspec) {
@@ -520,6 +523,7 @@ EOM
                'INSTALLMAN3DIR=none';
        }
        push @args, @$pass_through;
+       push @args, 'PERL=' . $perl if $perl; # use miniperl to run the Makefile later
        _quote_args(\@args) if IS_VMS;
        print join(' ', $perl, @args), "\n" if $verbose;
        my $code = do {