aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorнаб <[email protected]>2022-04-09 20:05:18 +0200
committerBrian Behlendorf <[email protected]>2022-05-10 10:19:36 -0700
commit674a9f3727f6e54fb3a391d4d6257a96f3a81a6e (patch)
tree3a8bbcf0e1efa26e6a8f2c6e664e085bf2a5954b
parent2820719800cde2576baa12a43e4b9124a1906e40 (diff)
autoconf: use include directives instead of recursing down udev
Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #13316
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
-rw-r--r--udev/Makefile.am7
-rw-r--r--udev/rules.d/Makefile.am10
4 files changed, 7 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index 7830f2bdd..e90a2eb51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ include $(srcdir)/%D%/lib/Makefile.am
include $(srcdir)/%D%/man/Makefile.am
include $(srcdir)/%D%/scripts/Makefile.am
if BUILD_LINUX
-SUBDIRS += udev
+include $(srcdir)/%D%/udev/Makefile.am
endif
endif
CPPCHECKDIRS += module
diff --git a/configure.ac b/configure.ac
index 292f9a45f..d4aa71e27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -290,8 +290,6 @@ AC_CONFIG_FILES([
tests/zfs-tests/tests/perf/regression/Makefile
tests/zfs-tests/tests/perf/scripts/Makefile
tests/zfs-tests/tests/stress/Makefile
- udev/Makefile
- udev/rules.d/Makefile
zfs.release
])
diff --git a/udev/Makefile.am b/udev/Makefile.am
index f930941fb..27d45a36a 100644
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -1 +1,6 @@
-SUBDIRS = rules.d
+udevrule_DATA = \
+ %D%/rules.d/69-vdev.rules \
+ %D%/rules.d/60-zvol.rules \
+ %D%/rules.d/90-zfs.rules
+
+SUBSTFILES += $(udevrule_DATA)
diff --git a/udev/rules.d/Makefile.am b/udev/rules.d/Makefile.am
deleted file mode 100644
index c62b05e53..000000000
--- a/udev/rules.d/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-CLEANFILES =
-EXTRA_DIST =
-include $(top_srcdir)/config/Substfiles.am
-
-udevrule_DATA = \
- 69-vdev.rules \
- 60-zvol.rules \
- 90-zfs.rules
-
-SUBSTFILES += $(udevrule_DATA)