c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 01:51:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

autoconf: use include directives instead of recursing down rpm

Browse Source 
Also simplify .gitignore

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13316
This commit is contained in:
наб 2022-04-09 19:44:40 +02:00 committed by Brian Behlendorf
parent 93a8c85e7b
commit 2820719800
8 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -13,7 +13,7 @@ ACLOCAL_AMFLAGS = -I config
SUBDIRS = include
if BUILD_LINUX
SUBDIRS += rpm
include $(srcdir)/%D%/rpm/Makefile.am
endif
CPPCHECKDIRS += etc/systemd/system-generators

3
configure.ac
View File

@ -97,12 +97,9 @@ AC_CONFIG_FILES([
lib/libzfs_core/libzfs_core.pc
module/Kbuild
module/Makefile
rpm/Makefile
rpm/generic/Makefile
rpm/generic/zfs-dkms.spec
rpm/generic/zfs-kmod.spec
rpm/generic/zfs.spec
rpm/redhat/Makefile
rpm/redhat/zfs-dkms.spec
rpm/redhat/zfs-kmod.spec
rpm/redhat/zfs.spec

1
rpm/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/*/*.spec

9
rpm/Makefile.am
View File

@ -1 +1,8 @@
SUBDIRS = generic redhat
EXTRA_DIST += \
%D%/generic/zfs-dkms.spec.in \
%D%/generic/zfs-kmod.spec.in \
%D%/generic/zfs.spec.in \
\
%D%/redhat/zfs-dkms.spec.in \
%D%/redhat/zfs-kmod.spec.in \
%D%/redhat/zfs.spec.in

3
rpm/generic/.gitignore vendored
View File

@ -1,3 +0,0 @@
/zfs-dkms.spec
/zfs-kmod.spec
/zfs.spec

1
rpm/generic/Makefile.am
View File

@ -1 +0,0 @@
EXTRA_DIST = zfs.spec.in zfs-kmod.spec.in zfs-dkms.spec.in

3
rpm/redhat/.gitignore vendored
View File

@ -1,3 +0,0 @@
/zfs-dkms.spec
/zfs-kmod.spec
/zfs.spec

1
rpm/redhat/Makefile.am
View File

@ -1 +0,0 @@
EXTRA_DIST = zfs.spec.in zfs-kmod.spec.in zfs-dkms.spec.in