From 314c55f0633ab80c43c4f97e1b1f954cff776f05 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@fb.com>
Date: Sun, 11 Jul 2021 18:34:22 -0700
Subject: 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.
---
 lib/Automake/Options.pm | 1 -
 lib/am/distdir.am       | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

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)
 ##
-- 
cgit v1.2.1