diff options
author | Alexandre Duret-Lutz <adl@gnu.org> | 2003-01-13 14:04:41 +0000 |
---|---|---|
committer | Alexandre Duret-Lutz <adl@gnu.org> | 2003-01-13 14:04:41 +0000 |
commit | bb174399353c6abdb95719f1e05a5415c4bf8cf5 (patch) | |
tree | 8da835e455bc6e9310ce5fdfd9829da40ae11782 /automake.in | |
parent | e3b2b0290322dd622d75e82fd09d20881f7ba793 (diff) | |
download | automake-bb174399353c6abdb95719f1e05a5415c4bf8cf5.tar.gz |
Use `_dirstamp' when the file-system doesn't support `.dirstamp'.
* m4/lead-dot.m4: New file.
* m4/Makefile.am (dist_m4data_DATA): Add lead-dot.m4
* m4/init.m4 (AM_INIT_AUTOMAKE): Require AM_SET_LEADING_DOT.:
* m4/depend.m4 (AM_SET_DEPDIR): Require AM_SET_LEADING_DOT. Define
DEPDIR using am__leading_dot.
* automake.in (require_build_directory): Define am__dirstamp, a new
variable for the dirstamp basename, based on am__leading_dot.
* tests/subobj6.test: Move all `test -f' into Makefiles, so we can
use $(am__dirstamp).
Reported by Richard Dawe.
Diffstat (limited to 'automake.in')
-rwxr-xr-x | automake.in | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/automake.in b/automake.in index 65294e3c4..64f088b51 100755 --- a/automake.in +++ b/automake.in @@ -605,7 +605,7 @@ my %object_compilation_map; # This keeps track of the directories for which we've already -# created `.dirstamp' code. +# created dirstamp code. my %directory_map; # All .P files. @@ -8750,23 +8750,28 @@ sub require_conf_file_with_macro ($$$@) # dependent upon. sub require_build_directory ($) { - my $directory = shift; - my $dirstamp = "$directory/.dirstamp"; + my $directory = shift; + my $dirstamp = "$directory/\$(am__dirstamp)"; - # Don't emit the rule twice. - if (! defined $directory_map{$directory}) + # Don't emit the rule twice. + if (! defined $directory_map{$directory}) { - $directory_map{$directory} = 1; + $directory_map{$directory} = 1; - # Directory must be removed by `make distclean'. - $clean_files{$dirstamp} = DIST_CLEAN; + # Set a variable for the dirstamp basename. + define_pretty_variable ('am__dirstamp', TRUE, INTERNAL, + '$(am__leading_dot)dirstamp') + unless variable_defined ('am__dirstamp'); - $output_rules .= ("$dirstamp:\n" - . "\t\@\$(mkinstalldirs) $directory\n" - . "\t\@: > $dirstamp\n"); + # Directory must be removed by `make distclean'. + $clean_files{$dirstamp} = DIST_CLEAN; + + $output_rules .= ("$dirstamp:\n" + . "\t\@\$(mkinstalldirs) $directory\n" + . "\t\@: > $dirstamp\n"); } - return $dirstamp; + return $dirstamp; } # &require_build_directory_maybe ($FILE) |