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
cmd/Makefile.am
+4 -4
View File
@@ -10,7 +10,7 @@ mounthelper_PROGRAMS =
sbin_SCRIPTS += fsck.zfs
SHELLCHECKSCRIPTS += fsck.zfs
CLEANFILES += fsck.zfs
EXTRA_DIST += %D%/fsck.zfs.in
dist_noinst_DATA += %D%/fsck.zfs.in
$(call SUBST,fsck.zfs,%D%/)
@@ -100,9 +100,9 @@ endif
if USING_PYTHON
bin_SCRIPTS += arc_summary arcstat dbufstat
CLEANFILES += arc_summary arcstat dbufstat
EXTRA_DIST += %D%/arc_summary %D%/arcstat.in %D%/dbufstat.in
bin_SCRIPTS += arc_summary arcstat dbufstat
CLEANFILES += arc_summary arcstat dbufstat
dist_noinst_DATA += %D%/arc_summary %D%/arcstat.in %D%/dbufstat.in
$(call SUBST,arcstat,%D%/)
$(call SUBST,dbufstat,%D%/)
cmd/zed/Makefile.am
+1 -1
View File
@@ -43,4 +43,4 @@ zed_LDADD = \
zed_LDADD += -lrt $(LIBATOMIC_LIBS) $(LIBUDEV_LIBS) $(LIBUUID_LIBS)
zed_LDFLAGS = -pthread
EXTRA_DIST += $(addprefix %D%/,agents/README.md)
dist_noinst_DATA += %D%/agents/README.md
cmd/zed/zed.d/Makefile.am
+1 -1
View File
@@ -38,7 +38,7 @@ zedconfdefaults = \
vdev_attach-led.sh \
vdev_clear-led.sh
EXTRA_DIST += $(addprefix %D%/,README)
dist_noinst_DATA += %D%/README
INSTALL_DATA_HOOKS += zed-install-data-hook
zed-install-data-hook:
cmd/zpool/Makefile.am
+1 -1
View File
@@ -38,7 +38,7 @@ zpool_LDADD += -lgeom
endif
zpool_LDADD += -lm $(LIBBLKID_LIBS) $(LIBUUID_LIBS)
EXTRA_DIST += $(addprefix %D%/,zpool.d/README compatibility.d)
dist_noinst_DATA += %D%/zpool.d/README
SHELLCHECKSCRIPTS += $(dist_zpoolexec_SCRIPTS)
zpoolexecdir = $(zfsexecdir)/zpool.d