From 674a9f3727f6e54fb3a391d4d6257a96f3a81a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Sat, 9 Apr 2022 20:05:18 +0200 Subject: [PATCH] autoconf: use include directives instead of recursing down udev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Brian Behlendorf Signed-off-by: Ahelenia Ziemiańska Closes #13316 --- Makefile.am | 2 +- configure.ac | 2 -- udev/Makefile.am | 7 ++++++- udev/rules.d/Makefile.am | 10 ---------- 4 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 udev/rules.d/Makefile.am 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)