X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=subdirmk%2Fgenerate;h=c431ec979b9009c227d44f81dc58045970720a02;hp=ea12a1f97424bcfd7fe5d8c9e8fa4c995ed641d3;hb=5c370689670a4401baa5bb111f136d6ec82d0547;hpb=e84bde92db920acfff950727d1f2f8a91844ca9b

diff --git a/subdirmk/generate b/subdirmk/generate
index ea12a1f..c431ec9 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -1,26 +1,30 @@
 #!/usr/bin/perl -w
 #
-# $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] SUBDIR...
+# $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
 #
-# generates in each subdirectory
-#   Subdir.mk.tmp
-#   Makefile
-# and in toplevel
-#   main.mk.tmp
-# from in each subdirectory
-#   Subdir.mk.in
-# and at toplevel
-#   Perdir.mk.in
+# generates in each subdirectory	from in each subdirectory
+#     Subdir.mk.tmp			    Subdir.mk.in
+#     Makefile
+# and in toplevel			and in toplevel
+#     main.mk.tmp			    Perdir.mk.in
 
 use strict;
+use POSIX;
 
-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;
 
@@ -101,13 +105,13 @@ sub filter_subdir_mk ($$$$$) {
     #use Data::Dumper;
     #print STDERR "filter @_\n";
 
-    my $in = "${dir_prefix}Subdir.mk.in";
+    my $in = "${srcdir}/${dir_prefix}Subdir.mk.in";
     my $caps_re = qr{[A-Z][0-9_A-Z]*(?=\W)};
     my $lc_re = qr{[a-z][-+,0-9_a-z]*(?=\W)};
     my $esclit = '&';
     my $esc = '\\&';
 
-    for my $f ($in, "Perdir.mk.in") {
+    for my $f ($in, "${srcdir}/Perdir.mk.in") {
       open I, '<', $f or die "open $f: $!\n";
       while (<I>) {
 	for (;;) {
@@ -143,7 +147,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;
@@ -176,6 +180,7 @@ sub process_subtree ($$) {
     foreach my $child (@{ $node->[1] }) {
 	my @childpath = (@$path, $child->[0]);
 	my $child_subdir = join '/', @childpath;
+	mkdir $child_subdir or $!==EEXIST or die "mkdir $child_subdir: $!";
 	push @{ $targets{$_} }, $child_subdir foreach
 	    process_subtree($child, \@childpath);
     }