tidying

diff --git a/subdirmk/generate b/subdirmk/generate
index ea12a1f97424bcfd7fe5d8c9e8fa4c995ed641d3..02722aa31bf1a9c037ac07e8ab7c6eda453b4fcb 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;
 

diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index f0f60bba24ac3676b2eac426c2c05c8ae306350d..50713d573e1169fb2ed31a31faa1cae255cf21ad 100644 (file)
--- 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 24e6d14fa5a772a3bfa8c1a1c48dadf91d7d84a9..69f2392e6920bd9273e434680b60a20f10c91368 100644 (file)
--- 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 
     ])
   ])
 ])