From ba71ecedfbdea7751ee544169551262cb08e63b6 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 13 Nov 2019 00:41:30 +0000
Subject: [PATCH] tidying

---
 subdirmk/generate    | 21 ++++++++++++++-------
 subdirmk/regen.mk.in |  2 +-
 subdirmk/subdirmk.ac |  3 +--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/subdirmk/generate b/subdirmk/generate
index ea12a1f..02722aa 100755
--- 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;
 
diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index f0f60bb..50713d5 100644
--- a/subdirmk/regen.mk.in
+++ b/subdirmk/regen.mk.in
@@ -7,7 +7,7 @@ CONFIGURE_ACS 	+= $(CONFIGURE_AC)
 CONFIGURE_ACS 	+= subdirmk/subdirmk.ac
 
 $(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
-	cd &^ && autoconf
+	cd $(top_srcdir) && autoconf
 
 $(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
 	./$(CONFIG_STATUS) --recheck
diff --git a/subdirmk/subdirmk.ac b/subdirmk/subdirmk.ac
index 24e6d14..69f2392 100644
--- a/subdirmk/subdirmk.ac
+++ b/subdirmk/subdirmk.ac
@@ -16,8 +16,7 @@ AC_DEFUN_ONCE([_SUBDIRMK_INIT],[
       ])
     ])
     AS_IF([\$subdirsmk_need_prep],[
-      echo 'running subdirmk/generate'
-     '$srcdir'/subdirmk/generate --srcdir '$srcdir' $subdirsmk_subdirs
+     '$srcdir'/subdirmk/generate --srcdir='$srcdir' $subdirsmk_subdirs 
     ])
   ])
 ])
-- 
2.30.2