c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-23 02:44:41 +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
lib/libnvpair/Makefile.am
+1 -1
View File
@@ -32,4 +32,4 @@ endif
libnvpair_la_LDFLAGS += -version-info 3:0:0
EXTRA_DIST += $(addprefix %D%/,libnvpair.abi libnvpair.suppr)
dist_noinst_DATA += %D%/libnvpair.abi %D%/libnvpair.suppr
lib/libuutil/Makefile.am
+1 -1
View File
@@ -26,4 +26,4 @@ endif
libuutil_la_LDFLAGS += -version-info 3:0:0
EXTRA_DIST += $(addprefix %D%/,libuutil.abi libuutil.suppr)
dist_noinst_DATA += %D%/libuutil.abi %D%/libuutil.suppr
lib/libzfs/Makefile.am
+2 -2
View File
@@ -76,5 +76,5 @@ libzfs_la_LDFLAGS += -version-info 5:0:1
pkgconfig_DATA += %D%/libzfs.pc
EXTRA_DIST += $(addprefix %D%/,libzfs.abi libzfs.suppr)
EXTRA_DIST += $(addprefix %D%/,THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip)
dist_noinst_DATA += %D%/libzfs.abi %D%/libzfs.suppr
dist_noinst_DATA += %D%/THIRDPARTYLICENSE.openssl %D%/THIRDPARTYLICENSE.openssl.descrip
lib/libzfs_core/Makefile.am
+1 -1
View File
@@ -43,4 +43,4 @@ libzfs_core_la_LDFLAGS += -version-info 3:0:0
pkgconfig_DATA += %D%/libzfs_core.pc
EXTRA_DIST += $(addprefix %D%/,libzfs_core.abi libzfs_core.suppr)
dist_noinst_DATA += %D%/libzfs_core.abi %D%/libzfs_core.suppr
lib/libzfsbootenv/Makefile.am
+1 -1
View File
@@ -26,4 +26,4 @@ libzfsbootenv_la_LDFLAGS += -version-info 1:0:0
pkgconfig_DATA += %D%/libzfsbootenv.pc
EXTRA_DIST += $(addprefix %D%/,libzfsbootenv.abi libzfsbootenv.suppr)
dist_noinst_DATA += %D%/libzfsbootenv.abi %D%/libzfsbootenv.suppr