]> git.proxmox.com Git - mirror_zfs.git/commit
Replace EXTRA_DIST with dist_noinst_DATA
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 26 May 2022 16:24:50 +0000 (09:24 -0700)
committerGitHub <noreply@github.com>
Thu, 26 May 2022 16:24:50 +0000 (09:24 -0700)
commitd98a67a53a180bd88ec8d9aeea75d92e1c9968b5
tree622c9d577ad42f9cf3ac31003fc614adc003f9b2
parentb62829295e9529d1c321816a1027fac5afc7d6f5
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 <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #13459
Closes #13505
27 files changed:
.github/workflows/zfs-tests-functional.yml
.github/workflows/zfs-tests-sanity.yml
.github/workflows/zloop.yml
Makefile.am
cmd/Makefile.am
cmd/zed/Makefile.am
cmd/zed/zed.d/Makefile.am
cmd/zpool/Makefile.am
config/Substfiles.am
config/zfs-build.m4
contrib/bpftrace/Makefile.am
contrib/dracut/Makefile.am
contrib/initramfs/Makefile.am
contrib/pyzfs/Makefile.am
contrib/zcp/Makefile.am
etc/Makefile.am
lib/libnvpair/Makefile.am
lib/libuutil/Makefile.am
lib/libzfs/Makefile.am
lib/libzfs_core/Makefile.am
lib/libzfsbootenv/Makefile.am
man/Makefile.am
rpm/Makefile.am
scripts/Makefile.am
tests/Makefile.am
tests/zfs-tests/cmd/Makefile.am
tests/zfs-tests/tests/Makefile.am