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:
+1
-1
@@ -25,6 +25,6 @@ dist_scripts_runfiles_DATA = \
|
||||
%D%/runfiles/sunos.run
|
||||
|
||||
|
||||
EXTRA_DIST += $(addprefix %D%/,README.md)
|
||||
dist_noinst_DATA += %D%/README.md
|
||||
|
||||
SHELLCHECKSCRIPTS += $(shell find $(srcdir)/%D% -name '*.sh')
|
||||
|
||||
@@ -41,7 +41,7 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/draid
|
||||
libnvpair.la
|
||||
%C%_draid_LDADD += $(ZLIB_LIBS)
|
||||
|
||||
EXTRA_DIST += $(addprefix %D%/,file/file_common.h)
|
||||
dist_noinst_DATA += %D%/file/file_common.h
|
||||
scripts_zfs_tests_bin_PROGRAMS += %D%/file_append %D%/file_check %D%/file_trunc %D%/file_write %D%/largest_file %D%/randwritecomp
|
||||
%C%_file_append_SOURCES = %D%/file/file_append.c
|
||||
%C%_file_check_SOURCES = %D%/file/file_check.c
|
||||
@@ -116,7 +116,7 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/xattrtest
|
||||
scripts_zfs_tests_bin_PROGRAMS += %D%/zed_fd_spill-zedlet
|
||||
|
||||
|
||||
EXTRA_DIST += $(addprefix %D%/,linux_dos_attributes/dos_attributes.h)
|
||||
dist_noinst_DATA += %D%/linux_dos_attributes/dos_attributes.h
|
||||
scripts_zfs_tests_bin_PROGRAMS += %D%/read_dos_attributes %D%/write_dos_attributes
|
||||
%C%_read_dos_attributes_SOURCES = %D%/linux_dos_attributes/read_dos_attributes.c
|
||||
%C%_write_dos_attributes_SOURCES = %D%/linux_dos_attributes/write_dos_attributes.c
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
CLEANFILES =
|
||||
EXTRA_DIST =
|
||||
dist_noinst_DATA =
|
||||
include $(top_srcdir)/config/Substfiles.am
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user