X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FAutoSplit.pm;h=f7b8eee76d7a1a6aca65774e0b7237b5977ebe94;hb=1b33cabaaf2fbe2e84c6a13a9b0a7fce45959c4f;hp=2d2465f5f18d11dcad18196fa0e80f07a3b85d3b;hpb=bb8fceff88bc3fe9e820d0761f1b0451a870ac65;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/AutoSplit.pm b/lib/AutoSplit.pm
index 2d2465f..f7b8eee 100644
--- a/lib/AutoSplit.pm
+++ b/lib/AutoSplit.pm
@@ -149,7 +149,10 @@ sub autosplit_file{
 
     # where to write output files
     $autodir = "lib/auto" unless $autodir;
-    ($autodir = VMS::Filespec::unixpath($autodir)) =~ s#/$## if $Is_VMS;
+    if ($Is_VMS) {
+	($autodir = VMS::Filespec::unixpath($autodir)) =~ s{/$}{};
+	$filename = VMS::Filespec::unixify($filename); # may have dirs
+    }
     unless (-d $autodir){
 	local($", @p)="/";
 	foreach(split(/\//,$autodir)){
@@ -251,6 +254,7 @@ sub autosplit_file{
     my @cache = ();
     my $caching = 1;
     while (<IN>) {
+	next if /^=\w/ .. /^=cut/;
 	if (/^package ([\w:]+)\s*;/) {
 	    warn "package $1; in AutoSplit section ignored. Not currently supported.";
 	}
@@ -282,7 +286,7 @@ sub autosplit_file{
 	    $caching = 0;
 	}
 	if($caching) {
-	    push(@cache, $_);
+	    push(@cache, $_) if @cache || /\S/;
 	}
 	else {
 	    print OUT $_;
@@ -292,6 +296,7 @@ sub autosplit_file{
 		print OUT @cache;
 		@cache = ();
 	    }
+	    print OUT "\n";
 	    $caching = 1;
 	}
     }