diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2013-09-30 13:56:53 -0400 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-10-21 14:19:17 +1000 |
| commit | d29e0fd1eb390f7116620ac4d75def57c7bce2aa (patch) | |
| tree | fec6b2fe85cb812f2d48abf29d2d93fc894b7cb1 | |
| parent | b44bb6f06736b7ee6de4c35b86f53c01b81da21e (diff) | |
The location of the udevdir is obtained from pkg-config. This is generally
/lib/udev. Most people run their build scripts as non-root and do not want to
overwrite or add files on their workstation system.
This was not the behaviour in release 12.8.0. The code in configure.ac set
udevdir based on common installation prefixes /usr or /usr/local for which
the user would probably have root permission anyway. Other prefixes would
be assigned a udevdir value under the given $prefix.
The patch proposes the default location $libdir/udev/rules.d and no longer
seeking it's value from pkg-config, just like what was done for hal.
The expectation is that the xorg source tree can be built from top to bottom
out of the box without tweaks or workarounds. A developer need to
manually install a rule under development and run an admin command for it to
take effect. Unlike binaries or libraries, there is no "path" style
variable to append a rule in development from a different location.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 362b8d2..ad05504 100644 --- a/configure.ac +++ b/configure.ac @@ -89,17 +89,14 @@ AC_ARG_WITH(hal-fdi-dir, HAL_FDI_DIR=${halfdidir} AC_SUBST(HAL_FDI_DIR) - -PKG_CHECK_MODULES(UDEV, udev, - [UDEV_RULES_DIR="`$PKG_CONFIG --variable=udevdir udev`/rules.d"], - [UDEV_RULES_DIR=no]) - +# Udev location for rules directory AC_ARG_WITH(udev-rules-dir, AS_HELP_STRING([--with-udev-rules-dir=DIR], - [Default udev rules.d directory - [[default=($prefix)/lib/udev/rules.d on Linux, none otherwise]]]), - [UDEV_RULES_DIR="$withval"], - []) + [Directory where udev expects its rules files + [[default=$libdir/udev/rules.d]]]), + [udevdir="$withval"], + [udevdir="$libdir/udev/rules.d"]) +UDEV_RULES_DIR=${udevdir} AC_SUBST(UDEV_RULES_DIR) AM_CONDITIONAL(HAS_UDEV_RULES_DIR, [test "x$UDEV_RULES_DIR" != "xno"]) |