fix stub Makefile to use MAKECMDGOALS

[subdirmk.git] / subdirmk / generate

diff --git a/subdirmk/generate b/subdirmk/generate
index 3b40ad0796304f18d66a005f7d2e347526a863aa..aae2e481e5992fb0068ef1ff2b71a10af75c17e7 100755 (executable)
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -95,11 +95,10 @@ sub write_makefile ($$) {
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all

-       \@: \$@

 %:     FORCE-ALWAYS-RUN
 %:     FORCE-ALWAYS-RUN

-       \$(MAKE) -C $cd -f main.mk ${dir_prefix}\$@
+       \@:

 Makefile FORCE-ALWAYS-RUN:
 Makefile FORCE-ALWAYS-RUN:

-       \@: \$@
+       \$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(MAKECMDGOALS))

 .SUFFIXES:
 END
 }
 .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,
                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 $_ ";
                o "\n";
            } else {
                die "unknown directive $_ ";