From: Jim Meyering <meyering@fb.com>
Date: Mon, 12 Jul 2021 01:34:22 +0000 (-0700)
Subject: no-dist-built-sources: fix-up
X-Git-Tag: v1.16.4~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=314c55f0633ab80c43c4f97e1b1f954cff776f05;p=thirdparty%2Fautomake.git

no-dist-built-sources: fix-up

* bin/automake.in (preprocess_file): Process new option here,
(handle_dist): ... not here.
* lib/Automake/Options.pm (_is_valid_easy_option):
Remove pure-dist.
* lib/am/distdir.am: Don't factor out the duplicate-looking
$(MAKE)... command.  Otherwise, many dist-using tests would fail
for me, e.g., t/aclocal-amflags.sh.
---

diff --git a/bin/automake.in b/bin/automake.in
index fde572cd1..f6ebe30ea 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -3920,9 +3920,7 @@ sub handle_dist ()
   $output_rules .= file_contents ('distdir',
 				  new Automake::Location,
 				  %transform,
-				  FILENAME_FILTER => $filename_filter,
-				  DIST_BUILT_SOURCES
-				    => ! option 'no-dist-built-sources');
+				  FILENAME_FILTER => $filename_filter);
 }
 
 
@@ -6865,6 +6863,7 @@ sub preprocess_file
 		 'SHAR'        => !! option 'dist-shar',
 		 'ZIP'         => !! option 'dist-zip',
 		 'ZSTD'        => !! option 'dist-zstd',
+		 'DIST_BUILT_SOURCES' => !! option 'dist-built-sources',
 
 		 'INSTALL-INFO' =>  ! option 'no-installinfo',
 		 'INSTALL-MAN'  =>  ! option 'no-installman',
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 6c07e5048..622b9ce65 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -290,7 +290,6 @@ sub _is_valid_easy_option ($)
     no-installman
     no-texinfo.tex
     nostdinc
-    pure-dist
     readme-alpha
     serial-tests
     parallel-tests
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 3b60b6e0b..9bd302804 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -77,10 +77,11 @@ endif %?SUBDIRS%
 
 if %?DIST_BUILT_SOURCES%
 distdir:
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 else !%?DIST_BUILT_SOURCES%
 distdir: $(BUILT_SOURCES)
-endif !%?DIST_BUILT_SOURCES%
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+endif !%?DIST_BUILT_SOURCES%
 
 distdir-am: $(DISTFILES)
 ##