Skip to contentSkip to conversation

fix UDEV_DATADIR fallback if pkg-config fails

PATCH In review Stefan Seyfried 2 participants 2 messages Jul 7, 2009 Bluetooth drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix UDEV_DATADIR fallback if pkg-config fails

---
 acinclude.m4 |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
acinclude.m4 +3 -1
index 48728e8..2018169 100644
@@ -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)
 ])
Signature · 1 line
1.6.3.2
maintainer
#1 lore raw

Hi Stefan,

Quoted 11 lines
---
 acinclude.m4 |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
acinclude.m4 +0 -0
index 48728e8..2018169 100644
@@ -111,9 +111,11 @@ AC_DEFUN([AC_INIT_BLUEZ], [
 	AC_SUBST(CONFIGDIR, "${configdir}")
 	AC_SUBST(STORAGEDIR, "${storagedir}")

acinclude.m4 AC_DEFUN([AC_INIT_BLUEZ], [ · line 121

Quoted 10 lines
acinclude.m4 +3 -1
 
-	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