autoconf: use include directives instead of recursing down rpm

Also simplify .gitignore

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13316

6 files changed, 9 insertions, 9 deletions

diff --git a/rpm/.gitignore b/rpm/.gitignore
new file mode 100644
index 000000000..f83960d1a
--- /dev/null
+++ b/rpm/.gitignore
@@ -0,0 +1 @@
+/*/*.spec
diff --git a/rpm/Makefile.am b/rpm/Makefile.am
index f2cf72cef..216cb731f 100644
--- 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
index 7f5daafdd..000000000
--- 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
index 89b13640d..000000000
--- 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
index 7f5daafdd..000000000
--- 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
index 89b13640d..000000000
--- a/rpm/redhat/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = zfs.spec.in zfs-kmod.spec.in zfs-dkms.spec.in