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

diff --git a/Makefile.am b/Makefile.am
index 09d5a6b804d7fd9e57cfae358861636f35fdb674..7830f2bdd4e4dd2dfc30e7c924c1c3590bf75911 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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

diff --git a/configure.ac b/configure.ac
index dd1f63f492f9f8e9fa654f9ae0afdf2b574743ea..292f9a45f1d1a431b70b35321d7611a43d398c3e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/rpm/.gitignore b/rpm/.gitignore
new file mode 100644 (file)
index 0000000..f83960d
--- /dev/null
+++ b/rpm/.gitignore
@@ -0,0 +1 @@
+/*/*.spec

diff --git a/rpm/Makefile.am b/rpm/Makefile.am
index f2cf72cef13ce964141811d9ba5fe472f46cc179..216cb731fea96eea5e91bddb2cdcab55dc6a0839 100644 (file)
--- a/rpm/Makefile.am
+++ b/rpm/Makefile.am
@@ -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

diff --git a/rpm/generic/.gitignore b/rpm/generic/.gitignore
deleted file mode 100644 (file)
index 7f5daaf..0000000
--- a/rpm/generic/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/zfs-dkms.spec
-/zfs-kmod.spec
-/zfs.spec

diff --git a/rpm/generic/Makefile.am b/rpm/generic/Makefile.am
deleted file mode 100644 (file)
index 89b1364..0000000
--- a/rpm/generic/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = zfs.spec.in zfs-kmod.spec.in zfs-dkms.spec.in

diff --git a/rpm/redhat/.gitignore b/rpm/redhat/.gitignore
deleted file mode 100644 (file)
index 7f5daaf..0000000
--- a/rpm/redhat/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/zfs-dkms.spec
-/zfs-kmod.spec
-/zfs.spec

diff --git a/rpm/redhat/Makefile.am b/rpm/redhat/Makefile.am
deleted file mode 100644 (file)
index 89b1364..0000000
--- a/rpm/redhat/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = zfs.spec.in zfs-kmod.spec.in zfs-dkms.spec.in