>>> "Martin" == Martin Frydl <[EMAIL PROTECTED]> writes:
[...] Martin> nobase_include_HEADERS = dir1/file1.h dir2/file2.h Martin> but I get errors: Martin> include/Makefile.am:: variable `include_HEADERS' not defined IMHO, Automake is stripping the 'nobase_' prefix at places it'd rather not. (See also http://mail.gnu.org/pipermail/automake-patches/2001-October/000286.html) I think the patch below should fix this behavior, but actually I didn't tested it. (There are no tests for the 'nobase_' feature in the testsuite, I'll make one this evening.) [...] 2001-10-16 Alexandre Duret-Lutz <[EMAIL PROTECTED]> * automake.in (am_install_var): Don't strip nobase_ from $X, do this with $nodir_name only. Index: automake.in =================================================================== RCS file: /cvs/automake/automake/automake.in,v retrieving revision 1.1181 diff -u -r1.1181 automake.in --- automake.in 2001/10/15 09:38:29 1.1181 +++ automake.in 2001/10/16 08:00:36 @@ -7401,25 +7401,25 @@ my $first = 1; foreach my $X (sort keys %valid) { + my $nodir_name = $X; my $one_name = $X . '_' . $primary; next unless (&variable_defined ($one_name)); my $strip_subdir = 1; # If subdir prefix should be preserved, do so. - if ($X =~ /^nobase_/) + if ($nodir_name =~ /^nobase_/) { $strip_subdir = 0; - $X =~ s/^nobase_//; + $nodir_name =~ s/^nobase_//; } - my $nodir_name = $X; # If files should be distributed, do so. my $dist_p = 0; if ($can_dist) { - $dist_p = (($default_dist && $one_name !~ /^nodist_/) - || (! $default_dist && $one_name =~ /^dist_/)); + $dist_p = (($default_dist && $nodir_name !~ /^nodist_/) + || (! $default_dist && $nodir_name =~ /^dist_/)); $nodir_name =~ s/^(dist|nodist)_//; } -- Alexandre Duret-Lutz
