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:
@@ -41,6 +41,6 @@ endef
|
||||
|
||||
SUBSTFILES =
|
||||
CLEANFILES += $(SUBSTFILES)
|
||||
EXTRA_DIST += $(SUBSTFILES:=.in)
|
||||
dist_noinst_DATA += $(SUBSTFILES:=.in)
|
||||
|
||||
$(call SUBST,%,)
|
||||
|
||||
@@ -268,6 +268,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [
|
||||
user) ZFS_AC_CONFIG_USER ;;
|
||||
all) ZFS_AC_CONFIG_USER
|
||||
ZFS_AC_CONFIG_KERNEL ;;
|
||||
dist) ;;
|
||||
srpm) ;;
|
||||
*)
|
||||
AC_MSG_RESULT([Error!])
|
||||
|
||||
Reference in New Issue
Block a user