X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=subdirmk%2Fgenerate;h=aae2e481e5992fb0068ef1ff2b71a10af75c17e7;hp=3b40ad0796304f18d66a005f7d2e347526a863aa;hb=416eb8d3aa0554fa9d7ee44e86d16a2be9761711;hpb=6dd3d7f7bf3899308f7e341392a0349c2ab8c031

diff --git a/subdirmk/generate b/subdirmk/generate
index 3b40ad0..aae2e48 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -95,11 +95,10 @@ sub write_makefile ($$) {
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all
-	\@: \$@
 %:	FORCE-ALWAYS-RUN
-	\$(MAKE) -C $cd -f main.mk ${dir_prefix}\$@
+	\@:
 Makefile FORCE-ALWAYS-RUN:
-	\@: \$@
+	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(MAKECMDGOALS))
 .SUFFIXES:
 END
 }
@@ -178,7 +177,7 @@ sub process_input_mk ($$$$$$$$) {
 		my $subf = "$srcdir/$2";
 		process_input_mk($dir_prefix, $dir_suffix, $dir_name,
 				 $var_prefix, $targets,
-				 $subf, $esclitr, $subf);
+				 $subf, $esclitr, $1);
 		o "\n";
 	    } else {
 		die "unknown directive $_ ";