diff options
| author | Brian Behlendorf <[email protected]> | 2022-05-26 09:24:50 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-05-26 09:24:50 -0700 |
| commit | d98a67a53a180bd88ec8d9aeea75d92e1c9968b5 (patch) | |
| tree | 622c9d577ad42f9cf3ac31003fc614adc003f9b2 /etc | |
| parent | b62829295e9529d1c321816a1027fac5afc7d6f5 (diff) | |
Replace EXTRA_DIST with dist_noinst_DATA
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #13459
Closes #13505
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/Makefile.am b/etc/Makefile.am index a41f04c90..53064eb6f 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -2,7 +2,7 @@ sudoersddir = $(sysconfdir)/sudoers.d sudoersd_DATA = \ %D%/sudoers.d/zfs -EXTRA_DIST += $(sudoersd_DATA) +dist_noinst_DATA += $(sudoersd_DATA) sysconf_zfsdir = $(sysconfdir)/zfs @@ -32,7 +32,7 @@ $(call SHELLCHECK_OPTS,$(initconf_DATA)): SHELLCHECK_SHELL = sh if INIT_SYSV -EXTRA_DIST += $(addprefix %D%/,init.d/README.md) +dist_noinst_DATA += %D%/init.d/README.md init_SCRIPTS = \ %D%/init.d/zfs-import \ |