[automake-commit] branch master updated: dirstamp: revert change of Jan 11 2023.

[Karl Berry]

This is an automated email from the git hooks/post-receive script.

karl pushed a commit to branch master
in repository automake.

View the commit online:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=4f5a624dfa457d414d9da204a06178dcaaef82ee

The following commit(s) were added to refs/heads/master by this push:
     new 4f5a624df dirstamp: revert change of Jan 11 2023.
4f5a624df is described below

commit 4f5a624dfa457d414d9da204a06178dcaaef82ee
Author: Karl Berry <karl@freefriends.org>
AuthorDate: Tue Feb 28 15:14:07 2023 -0800

    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
---
 bin/automake.in | 12 ++++--------
 1 file 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;
 }