2009-07-07 07:57:10

by Stefan Seyfried

Subject: [PATCH] fix UDEV_DATADIR fallback if pkg-config fails

---
acinclude.m4 | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 48728e8..2018169 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -111,9 +111,11 @@ AC_DEFUN([AC_INIT_BLUEZ], [
AC_SUBST(CONFIGDIR, "${configdir}")
AC_SUBST(STORAGEDIR, "${storagedir}")

- UDEV_DATADIR="`$PKG_CONFIG --variable=udevdir udev`/rules.d"
+ UDEV_DATADIR="`$PKG_CONFIG --variable=udevdir udev`"
if (test -z "${UDEV_DATADIR}"); then
UDEV_DATADIR="${sysconfdir}/udev/rules.d"
+ else
+ UDEV_DATADIR="${UDEV_DATADIR}/rules.d"
fi
AC_SUBST(UDEV_DATADIR)
])
--
1.6.3.2

2009-07-07 17:18:44

by Marcel Holtmann

Subject: Re: [PATCH] fix UDEV_DATADIR fallback if pkg-config fails

Hi Stefan,

> ---
> acinclude.m4 | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/acinclude.m4 b/acinclude.m4
> index 48728e8..2018169 100644
> --- a/acinclude.m4
> +++ b/acinclude.m4
> @@ -111,9 +111,11 @@ AC_DEFUN([AC_INIT_BLUEZ], [
> AC_SUBST(CONFIGDIR, "${configdir}")
> AC_SUBST(STORAGEDIR, "${storagedir}")
>
> - UDEV_DATADIR="`$PKG_CONFIG --variable=udevdir udev`/rules.d"
> + UDEV_DATADIR="`$PKG_CONFIG --variable=udevdir udev`"
> if (test -z "${UDEV_DATADIR}"); then
> UDEV_DATADIR="${sysconfdir}/udev/rules.d"
> + else
> + UDEV_DATADIR="${UDEV_DATADIR}/rules.d"
> fi
> AC_SUBST(UDEV_DATADIR)
> ])

brown paper bag is one me :(

Patch has been applied. Thanks.

Regards

Marcel