c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace EXTRA_DIST with dist_noinst_DATA

Browse Source 
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
This commit is contained in:
Brian Behlendorf
2022-05-26 09:24:50 -07:00
committed by GitHub
parent b62829295e
commit d98a67a53a
27 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
etc/Makefile.am
+2 -2
View File
@@ -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 \