X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=build-aux%2Fsubdirmk-setup;h=e08de6eeebdfd78a78037b171ca52fd1948ce2e0;hp=976e3ce0055a74ff4eeb0ae654efca55587c55ba;hb=6bdebd83b99b5078fa224236bec2babd9b6a5f54;hpb=ad6795dd7d122fa1b3a0613c075e87479980f93f

diff --git a/build-aux/subdirmk-setup b/build-aux/subdirmk-setup
index 976e3ce..e08de6e 100755
--- a/build-aux/subdirmk-setup
+++ b/build-aux/subdirmk-setup
@@ -89,14 +89,15 @@ sub filter_subdir_mk ($$$$$) {
     #use Data::Dumper;
     #print STDERR "filter @_\n";
 
-    my $in = "${srcdir}/${dir_prefix}Subdir.mk.in";
-    open I, '<', $in or die "open $in: $!\n";
+    my $in = "${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 = '\\&';
 
-    while (<I>) {
+    for my $f ($in, "Perdir.mk.in") {
+      open I, '<', $f or die "open $f: $!\n";
+      while (<I>) {
 	for (;;) {
 	    unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
 	    o $1;
@@ -138,6 +139,8 @@ sub filter_subdir_mk ($$$$$) {
 		die "bad escape $esclit$_ ";
 	    }
 	}
+      }
+      I->error and die "read $f: $!\n";
     }
 }