fixes

[subdirmk.git] / subdirmk / generate

diff --git a/subdirmk/generate b/subdirmk/generate
index ea12a1f97424bcfd7fe5d8c9e8fa4c995ed641d3..ae5db303ea79c56504b76070a29f018ab4c9b23f 100755 (executable)
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] SUBDIR...
+# $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
 #
 # generates in each subdirectory
 #   Subdir.mk.tmp
@@ -14,13 +14,20 @@
 
 use strict;
 
-our $srcdir;
-our @subdirs = @ARGV;
+print "$0 @ARGV\n" or die $!;
+
+our $srcdir='.';
 
-die unless $ARGV[0] eq '--srcdir';
-die unless @ARGV>=2;
-shift @ARGV;
-($srcdir, @subdirs) = @ARGV;
+while (@ARGV && $ARGV[0] =~ m/^-/) {
+    $_ = shift @ARGV;
+    last if $_ eq '--';
+    if (s/^--srcdir=//) {
+       $srcdir=$';
+    } else {
+       die "$0: unknown option \`$_'\n";
+    }
+}
+our @subdirs = @ARGV;
 
 s{/+$}{} foreach @subdirs;
 
@@ -143,7 +150,7 @@ sub filter_subdir_mk ($$$$$) {
            } elsif (s{^![ \t]+}{}) {
                o $_;
                $_ = '';
-           } elsif (s{^!(\pPosixWord+|\pPosixPunct+)[ \t]*}{}) {
+           } elsif (s{^!(\S+)(?:[ \t]+|$)}{}) {
                $esclit = $1;
                $esc = $esclit;
                $esc =~ s/\W/\\$&/g;