builddefs: refactor udev directory specification

Refactor the code that finds the udev rules directory to detect the
location of the parent udev directory instead.  IOWs, we go from:

UDEV_RULE_DIR=/foo/bar/rules.d

to:

UDEV_DIR=/foo/bar
UDEV_RULE_DIR=/foo/bar/rules.d

This is needed by the next patch, which adds a helper script.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/configure.ac b/configure.ac
index a48c8f6a3f14f8a9598ee9a63972725325b8877b..a0d3a7a0acab97ffb426505ef9d33494c6ed618b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -164,7 +164,7 @@ if test "$enable_scrub" = "yes"; then
 fi
 AC_CONFIG_SYSTEMD_SYSTEM_UNIT_DIR
 AC_CONFIG_CROND_DIR
-AC_CONFIG_UDEV_RULE_DIR
+AC_CONFIG_UDEV_DIR
 AC_HAVE_BLKID_TOPO
 
 if test "$enable_ubsan" = "yes" || test "$enable_ubsan" = "probe"; then

diff --git a/include/builddefs.in b/include/builddefs.in
index 316c443aee8d3915db6ec17c1454b95724d01e88..7c49fd3decb18cbd6f05d6040aeb8a25cb0519d2 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -109,7 +109,8 @@ SYSTEMD_SYSTEM_UNIT_DIR = @systemd_system_unit_dir@
 HAVE_CROND = @have_crond@
 CROND_DIR = @crond_dir@
 HAVE_UDEV = @have_udev@
-UDEV_RULE_DIR = @udev_rule_dir@
+UDEV_DIR = @udev_dir@
+UDEV_RULE_DIR = @udev_dir@/rules.d
 HAVE_LIBURCU_ATOMIC64 = @have_liburcu_atomic64@
 USE_RADIX_TREE_FOR_INUMS = @use_radix_tree_for_inums@
 

diff --git a/m4/package_services.m4 b/m4/package_services.m4
index a683ddb93e0e9124e9b4eaebde7d700f90886727..de0504df0c206ffb0af5f85cd13b730fc99293fa 100644 (file)
--- a/m4/package_services.m4
+++ b/m4/package_services.m4
@@ -77,33 +77,33 @@ AC_DEFUN([AC_CONFIG_CROND_DIR],
 ])
 
 #
-# Figure out where to put udev rule files
+# Figure out where to put udev files
 #
-AC_DEFUN([AC_CONFIG_UDEV_RULE_DIR],
+AC_DEFUN([AC_CONFIG_UDEV_DIR],
 [
        AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-       AC_ARG_WITH([udev_rule_dir],
-         [AS_HELP_STRING([--with-udev-rule-dir@<:@=DIR@:>@],
-               [Install udev rules into DIR.])],
+       AC_ARG_WITH([udev_dir],
+         [AS_HELP_STRING([--with-udev-dir@<:@=DIR@:>@],
+               [Install udev files underneath DIR.])],
          [],
-         [with_udev_rule_dir=yes])
-       AS_IF([test "x${with_udev_rule_dir}" != "xno"],
+         [with_udev_dir=yes])
+       AS_IF([test "x${with_udev_dir}" != "xno"],
          [
-               AS_IF([test "x${with_udev_rule_dir}" = "xyes"],
+               AS_IF([test "x${with_udev_dir}" = "xyes"],
                  [
                        PKG_CHECK_MODULES([udev], [udev],
                          [
-                               with_udev_rule_dir="$($PKG_CONFIG --variable=udev_dir udev)/rules.d"
+                               with_udev_dir="$($PKG_CONFIG --variable=udev_dir udev)"
                          ], [
-                               with_udev_rule_dir=""
+                               with_udev_dir=""
                          ])
                        m4_pattern_allow([^PKG_(MAJOR|MINOR|BUILD|REVISION)$])
                  ])
-               AC_MSG_CHECKING([for udev rule dir])
-               udev_rule_dir="${with_udev_rule_dir}"
-               AS_IF([test -n "${udev_rule_dir}"],
+               AC_MSG_CHECKING([for udev dir])
+               udev_dir="${with_udev_dir}"
+               AS_IF([test -n "${udev_dir}"],
                  [
-                       AC_MSG_RESULT(${udev_rule_dir})
+                       AC_MSG_RESULT(${udev_dir})
                        have_udev="yes"
                  ],
                  [
@@ -115,5 +115,5 @@ AC_DEFUN([AC_CONFIG_UDEV_RULE_DIR],
                have_udev="disabled"
          ])
        AC_SUBST(have_udev)
-       AC_SUBST(udev_rule_dir)
+       AC_SUBST(udev_dir)
 ])