mirror of
				https://git.proxmox.com/git/mirror_zfs
				synced 2025-10-31 07:58:45 +00:00 
			
		
		
		
	 d98a67a53a
			
		
	
	
		d98a67a53a
		
			
		
	
	
	
	
		
			
			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
		
			
				
	
	
		
			40 lines
		
	
	
		
			858 B
		
	
	
	
		
			Makefile
		
	
	
	
	
	
			
		
		
	
	
			40 lines
		
	
	
		
			858 B
		
	
	
	
		
			Makefile
		
	
	
	
	
	
| i_tdir = /usr/share/initramfs-tools
 | |
| dist_i_t_SCRIPTS = \
 | |
| 	%D%/zfsunlock
 | |
| 
 | |
| 
 | |
| i_t_confhooks_ddir = $(i_tdir)/conf-hooks.d
 | |
| dist_i_t_confhooks_d_DATA = \
 | |
| 	%D%/conf-hooks.d/zfs
 | |
| 
 | |
| 
 | |
| i_t_conf_ddir = $(i_tdir)/conf.d
 | |
| dist_i_t_conf_d_DATA = \
 | |
| 	%D%/conf.d/zfs
 | |
| 
 | |
| 
 | |
| i_t_hooksdir = $(i_tdir)/hooks
 | |
| i_t_hooks_SCRIPTS = \
 | |
| 	%D%/hooks/zfs \
 | |
| 	%D%/hooks/zfsunlock
 | |
| 
 | |
| SUBSTFILES += $(i_t_hooks_SCRIPTS)
 | |
| 
 | |
| 
 | |
| i_t_scriptsdir = $(i_tdir)/scripts
 | |
| dist_i_t_scripts_SCRIPTS = \
 | |
| 	%D%/scripts/zfs
 | |
| 
 | |
| 
 | |
| i_t_scripts_localtopdir = $(i_t_scriptsdir)/local-top
 | |
| dist_i_t_scripts_localtop_SCRIPTS = \
 | |
| 	%D%/scripts/local-top/zfs
 | |
| 
 | |
| 
 | |
| i_t_check_scripts    = $(dist_i_t_SCRIPTS) $(i_t_hooks_SCRIPTS) $(dist_i_t_scripts_SCRIPTS) $(dist_i_t_scripts_localtop_SCRIPTS)
 | |
| SHELLCHECKSCRIPTS   += $(i_t_check_scripts)
 | |
| $(call SHELLCHECK_OPTS,$(i_t_check_scripts)): SHELLCHECK_SHELL = sh
 | |
| 
 | |
| 
 | |
| dist_noinst_DATA += %D%/README.md
 |