do not demand \W after CAPS and lc

[subdirmk.git] / subdirmk / generate

diff --git a/subdirmk/generate b/subdirmk/generate
index 4b303bb655e20bb7765d38af5d8b40e037a847b5..6ce18f96d88d55535f830126662e1751536a0aa6 100755 (executable)
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -109,8 +109,8 @@ sub process_input_mk ($$$$$$$$) {
        $var_prefix, $targets,
        $f, $esclitr, $enoent_ok) = @_;
 
-    my $caps_re = qr{[A-Z][0-9_A-Z]*(?=\W)};
-    my $lc_re = qr{[a-z][-+,0-9_a-z]*(?=\W)};
+    my $caps_re = qr{[A-Z]};
+    my $lc_re = qr{[a-z]};
 
     my $esc;
     my $set_esc = sub {
@@ -241,7 +241,7 @@ sub process_subtree ($$) {
     my @targets = sort keys %targets;
     foreach my $target (@targets) {
        my $target_varname = target_varname($var_prefix, $target);
-       print O "${dir_prefix}${target}: \$($target_varname)";
+       print O "${dir_prefix}${target}:: \$($target_varname)";
        foreach my $child_subdir (@{ $targets{$target} }) {
            print O " $child_subdir/$target";
        }