diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 7 | ||||
| -rwxr-xr-x | bootstrap-configure | 1 | ||||
| -rw-r--r-- | scripts/Makefile.am | 2 |
4 files changed, 8 insertions, 4 deletions
@@ -21,7 +21,7 @@ In order to compile Bluetooth utilities you need following software packages: To configure run: ./configure --prefix=/usr --mandir=/usr/share/man \ - --sysconfdir=/etc --localstatedir=/var + --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib Configure automatically searches for all required components and packages. diff --git a/acinclude.m4 b/acinclude.m4 index c4c814f0..2c72f0c2 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -28,6 +28,11 @@ AC_DEFUN([AC_INIT_BLUEZ], [ AC_SUBST([localstatedir], ['/var']) fi + dnl no prefix and no libexecdir, so default to /lib + if (test "$libexecdir" = '${prefix}/lib'); then + AC_SUBST([libexecdir], ['/lib']) + fi + dnl no prefix and no mandir, so use ${prefix}/share/man as default if (test "$mandir" = '${prefix}/man'); then AC_SUBST([mandir], ['${prefix}/share/man']) @@ -52,8 +57,6 @@ AC_DEFUN([AC_INIT_BLUEZ], [ storagedir="${localstatedir}/lib/bluetooth" fi - AC_SUBST([udevexecdir], ['/lib/udev']) - AC_DEFINE_UNQUOTED(CONFIGDIR, "${configdir}", [Directory for the configuration files]) AC_DEFINE_UNQUOTED(STORAGEDIR, "${storagedir}", [Directory for the storage files]) ]) diff --git a/bootstrap-configure b/bootstrap-configure index c044f75b..0df86183 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -11,5 +11,6 @@ fi --mandir=/usr/share/man \ --sysconfdir=/etc \ --localstatedir=/var \ + --libexecdir=/lib \ --enable-all \ --disable-initscripts diff --git a/scripts/Makefile.am b/scripts/Makefile.am index b9395a6d..55da7180 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -3,7 +3,7 @@ rulesdir = $(sysconfdir)/udev rules_DATA = bluetooth.rules -udevdir = $(udevexecdir) +udevdir = $(libexecdir)/udev udev_SCRIPTS = bluetooth_serial |