autoconf: use include directives instead of recursing down rpm
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:
parent
93a8c85e7b
commit
2820719800
@ -13,7 +13,7 @@ ACLOCAL_AMFLAGS = -I config
|
|||||||
|
|
||||||
SUBDIRS = include
|
SUBDIRS = include
|
||||||
if BUILD_LINUX
|
if BUILD_LINUX
|
||||||
SUBDIRS += rpm
|
include $(srcdir)/%D%/rpm/Makefile.am
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CPPCHECKDIRS += etc/systemd/system-generators
|
CPPCHECKDIRS += etc/systemd/system-generators
|
||||||
|
@ -97,12 +97,9 @@ AC_CONFIG_FILES([
|
|||||||
lib/libzfs_core/libzfs_core.pc
|
lib/libzfs_core/libzfs_core.pc
|
||||||
module/Kbuild
|
module/Kbuild
|
||||||
module/Makefile
|
module/Makefile
|
||||||
rpm/Makefile
|
|
||||||
rpm/generic/Makefile
|
|
||||||
rpm/generic/zfs-dkms.spec
|
rpm/generic/zfs-dkms.spec
|
||||||
rpm/generic/zfs-kmod.spec
|
rpm/generic/zfs-kmod.spec
|
||||||
rpm/generic/zfs.spec
|
rpm/generic/zfs.spec
|
||||||
rpm/redhat/Makefile
|
|
||||||
rpm/redhat/zfs-dkms.spec
|
rpm/redhat/zfs-dkms.spec
|
||||||
rpm/redhat/zfs-kmod.spec
|
rpm/redhat/zfs-kmod.spec
|
||||||
rpm/redhat/zfs.spec
|
rpm/redhat/zfs.spec
|
||||||
|
1
rpm/.gitignore
vendored
Normal file
1
rpm/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/*/*.spec
|
@ -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
3
rpm/generic/.gitignore
vendored
@ -1,3 +0,0 @@
|
|||||||
/zfs-dkms.spec
|
|
||||||
/zfs-kmod.spec
|
|
||||||
/zfs.spec
|
|
@ -1 +0,0 @@
|
|||||||
EXTRA_DIST = zfs.spec.in zfs-kmod.spec.in zfs-dkms.spec.in
|
|
3
rpm/redhat/.gitignore
vendored
3
rpm/redhat/.gitignore
vendored
@ -1,3 +0,0 @@
|
|||||||
/zfs-dkms.spec
|
|
||||||
/zfs-kmod.spec
|
|
||||||
/zfs.spec
|
|
@ -1 +0,0 @@
|
|||||||
EXTRA_DIST = zfs.spec.in zfs-kmod.spec.in zfs-dkms.spec.in
|
|
Loading…
Reference in New Issue
Block a user