diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-08-19 22:27:38 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-08-19 22:35:57 +0200 |
| commit | 4ef8c8a39392c25ae3fc5ac59583fb3361cf5663 (patch) | |
| tree | 17540783cc9b64d62d693c8d44ac82a24e7763fd /configure.ac | |
| parent | e9c3ed523c0134548a66cfd6677eb4c034439796 (diff) | |
Play better with non-FHS distroselogind/v219.2
* Makefile.am: Remove rootprefix, rootbindir, and rootlibexecdir.
udevrulesdir is substed from configure.ac. Adapt distcheck.
* autogen.sh: Make more normal.
* configure.ac: Add --with-udevrulesdir. Remove --with-rootprefix.
Detect bin dir for udev.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index e77cfe2992..1507738907 100644 --- a/configure.ac +++ b/configure.ac @@ -293,6 +293,13 @@ AM_CONDITIONAL(HAVE_DBUS, [test "$have_dbus" = "yes"]) # ------------------------------------------------------------------------------ PKG_CHECK_MODULES(UDEV, [libudev]) +AC_ARG_WITH([udevrulesdir], + AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]), + [], + [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d]) +AC_SUBST([udevrulesdir], [$with_udevrulesdir]) +AC_SUBST([udevbindir], [$($PKG_CONFIG --variable=udevdir udev)/../bin]) + # ------------------------------------------------------------------------------ have_coverage=no AC_ARG_ENABLE(coverage, AS_HELP_STRING([--enable-coverage], [enable test coverage])) @@ -560,10 +567,6 @@ AC_ARG_WITH([zshcompletiondir], AS_HELP_STRING([--with-zshcompletiondir=DIR], [Zsh completions directory]), [], [with_zshcompletiondir=${datadir}/zsh/site-functions]) -AC_ARG_WITH([rootprefix], - AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]), - [], [with_rootprefix=${ac_default_prefix}]) - AC_ARG_WITH([rootlibdir], AS_HELP_STRING([--with-rootlibdir=DIR], [Root directory for libraries necessary for boot]), [], @@ -641,7 +644,6 @@ AC_SUBST([bashcompletiondir], [$with_bashcompletiondir]) AC_SUBST([zshcompletiondir], [$with_zshcompletiondir]) AC_SUBST([pamlibdir], [$with_pamlibdir]) AC_SUBST([pamconfdir], [$with_pamconfdir]) -AC_SUBST([rootprefix], [$with_rootprefix]) AC_SUBST([rootlibdir], [$with_rootlibdir]) AC_CONFIG_FILES([ @@ -669,7 +671,6 @@ AC_MSG_RESULT([ extra debugging: ${enable_debug} prefix: ${prefix} - rootprefix: ${with_rootprefix} sysconf dir: ${sysconfdir} datarootdir: ${datarootdir} includedir: ${includedir} |