From d98a67a53a180bd88ec8d9aeea75d92e1c9968b5 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 26 May 2022 09:24:50 -0700 Subject: Replace EXTRA_DIST with dist_noinst_DATA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The EXTRA_DIST variable is ignored when used in the FALSE conditional of a Makefile.am. This results in the `make dist` target omitting these files from the generated tarball unless CONFIG_USER is defined. This issue can be avoided by switching to use the dist_noinst_DATA variable which is handled as expected by autoconf. This change also adds support for --with-config=dist as an alias for --with-config=srpm and updates the GitHub workflows to use it. Reviewed-by: Ahelenia Ziemiańska Signed-off-by: Brian Behlendorf Closes #13459 Closes #13505 --- rpm/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rpm/Makefile.am') diff --git a/rpm/Makefile.am b/rpm/Makefile.am index 216cb731f..af7b25021 100644 --- a/rpm/Makefile.am +++ b/rpm/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST += \ +dist_noinst_DATA += \ %D%/generic/zfs-dkms.spec.in \ %D%/generic/zfs-kmod.spec.in \ %D%/generic/zfs.spec.in \ -- cgit v1.2.3