mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 02:27:36 +03:00
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
This commit is contained in:
+4
-5
@@ -6,7 +6,7 @@ dist_scripts_SCRIPTS = \
|
||||
%D%/zimport.sh \
|
||||
%D%/zloop.sh
|
||||
|
||||
EXTRA_SCRIPTS = \
|
||||
dist_noinst_SCRIPTS = \
|
||||
%D%/commitcheck.sh \
|
||||
%D%/common.sh.in \
|
||||
%D%/dkms.mkconf \
|
||||
@@ -18,14 +18,13 @@ EXTRA_SCRIPTS = \
|
||||
%D%/paxcheck.sh \
|
||||
%D%/zfs-tests-color.sh
|
||||
|
||||
EXTRA_DIST += \
|
||||
dist_noinst_DATA += \
|
||||
%D%/cstyle.pl \
|
||||
%D%/enum-extract.pl \
|
||||
%D%/zfs2zol-patch.sed \
|
||||
%D%/zol2zfs-patch.sed \
|
||||
$(EXTRA_SCRIPTS)
|
||||
%D%/zol2zfs-patch.sed
|
||||
|
||||
SHELLCHECKSCRIPTS += $(dist_scripts_SCRIPTS) $(EXTRA_SCRIPTS)
|
||||
SHELLCHECKSCRIPTS += $(dist_scripts_SCRIPTS) $(dist_noinst_SCRIPTS)
|
||||
|
||||
define SCRIPTS_EXTRA_ENVIRONMENT
|
||||
|
||||
|
||||
Reference in New Issue
Block a user