diff options
| author | Karl Berry <karl@freefriends.org> | 2023-02-28 15:14:07 -0800 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2023-02-28 15:14:07 -0800 |
| commit | 4f5a624dfa457d414d9da204a06178dcaaef82ee (patch) | |
| tree | ce2abfd611a35f0e7a9b16454fec48e3844de2a6 | |
| parent | 01bf65daf6f6627b56fbe78fc436fd877ccd3537 (diff) | |
| download | automake-4f5a624dfa457d414d9da204a06178dcaaef82ee.tar.gz | |
dirstamp: revert change of Jan 11 2023.
Fixes (hopefully) automake bug https://bugs.gnu.org/61867.
* bin/automake.in: restore explicit per-directory pattern rules,
since evidently @D is not supported on BSD-derived makes,
whatever POSIX says. That is, revert this commit:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=55f8fcfd08cbf15d65d61dd2db934b6c3171cf06
| -rw-r--r-- | bin/automake.in | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/bin/automake.in b/bin/automake.in index afd296afa..f249064d5 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -7893,14 +7893,6 @@ sub require_build_directory $directory_map{$directory} = $dirstamp; $directory_map{$cdir} = $dirstamp; - # Generate the pattern rule only once. - if (! vardef ('am__dirstamp', TRUE)) - { - $output_rules .= ("%/\$(am__dirstamp):\n" - . "\t\@\$(MKDIR_P) \$(\@D)\n" - . "\t\@: >>\$\@\n"); - } - # Set a variable for the dirstamp basename. define_pretty_variable ('am__dirstamp', TRUE, INTERNAL, '$(am__leading_dot)dirstamp'); @@ -7908,6 +7900,10 @@ sub require_build_directory # Directory must be removed by 'make distclean'. $clean_files{$dirstamp} = DIST_CLEAN; + $output_rules .= ("$dirstamp:\n" + . "\t\@\$(MKDIR_P) $directory\n" + . "\t\@: >>$dirstamp\n"); + return $dirstamp; } |