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

diff --git a/subdirmk/generate b/subdirmk/generate
index ae5db30..c431ec9 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -2,17 +2,14 @@
 #
 # $(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;
 
 print "$0 @ARGV\n" or die $!;
 
@@ -108,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 (;;) {
@@ -183,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);
     }