Integrate podlators-1.25

[p5sagit/p5-mst-13.2.git] / lib / ExtUtils / MM_Unix.pm

diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 0cd45eb..c5bb19e 100644 (file)
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -1349,8 +1349,15 @@ sub init_dirscan {       # --- File and Directory Lists (.xs .pm .pod etc)
     # (which includes PARENT_NAME). This is a subtle distinction but one
     # that's important for nested modules.
 
-    $self->{PMLIBDIRS} = ['lib', $self->{BASEEXT}]
+    if ($Is_VMS) {
+      # avoid logical name collisions by adding directory syntax
+      $self->{PMLIBDIRS} = ['./lib', './' . $self->{BASEEXT}]
        unless $self->{PMLIBDIRS};
+    }
+    else {
+      $self->{PMLIBDIRS} = ['lib', $self->{BASEEXT}]
+       unless $self->{PMLIBDIRS};
+    }
 
     #only existing directories that aren't in $dir are allowed
 
@@ -1419,7 +1426,7 @@ sub init_dirscan {        # --- File and Directory Lists (.xs .pm .pod etc)
                my($ispod)=0;
                if (open(FH,"<$name")) {
                    while (<FH>) {
-                       if (/^=head1\s+\w+/) {
+                       if (/^=\w/) {
                            $ispod=1;
                            last;
                        }
@@ -1448,7 +1455,7 @@ sub init_dirscan {        # --- File and Directory Lists (.xs .pm .pod etc)
                my($ispod)=0;
                if (open(FH,"<$name")) {
                    while (<FH>) {
-                       if (/^=head1\s+\w+/) {
+                       if (/^=\w/) {
                            $ispod=1;
                            last;
                        }