From 76e47c384f9542fdf12b1b99fb36e8db5db4ae6b Mon Sep 17 00:00:00 2001
From: Ian Stakenvicius <axs@gentoo.org>
Date: Thu, 22 Nov 2012 09:45:09 -0500
Subject: Make udevlibexecdir be substituted out of configure and assigned
 ${rootlibdir}/udev instead of ${root}/lib/udev

---
 src/accelerometer/Makefile.am | 2 +-
 src/ata_id/Makefile.am        | 2 +-
 src/cdrom_id/Makefile.am      | 2 +-
 src/collect/Makefile.am       | 2 +-
 src/keymap/Makefile.am        | 2 +-
 src/mtd_probe/Makefile.am     | 2 +-
 src/scsi_id/Makefile.am       | 2 +-
 src/udev/Makefile.am          | 2 +-
 src/v4l_id/Makefile.am        | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/accelerometer/Makefile.am b/src/accelerometer/Makefile.am
index 5bb7ee4a58..46b8801645 100644
--- a/src/accelerometer/Makefile.am
+++ b/src/accelerometer/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 rootprefix=@rootprefix@
-udevlibexecdir=$(rootprefix)/lib/udev
+udevlibexecdir=@udevlibexecdir@
 
 AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/libudev \
diff --git a/src/ata_id/Makefile.am b/src/ata_id/Makefile.am
index a93d93f256..545daf23ec 100644
--- a/src/ata_id/Makefile.am
+++ b/src/ata_id/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 rootprefix=@rootprefix@
-udevlibexecdir=$(rootprefix)/lib/udev
+udevlibexecdir=@udevlibexecdir@
 
 AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/libudev \
diff --git a/src/cdrom_id/Makefile.am b/src/cdrom_id/Makefile.am
index d5168b29cc..321b23b928 100644
--- a/src/cdrom_id/Makefile.am
+++ b/src/cdrom_id/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 rootprefix=@rootprefix@
-udevlibexecdir=$(rootprefix)/lib/udev
+udevlibexecdir=@udevlibexecdir@
 
 AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/libudev \
diff --git a/src/collect/Makefile.am b/src/collect/Makefile.am
index 58bc818475..d96cc3946b 100644
--- a/src/collect/Makefile.am
+++ b/src/collect/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 rootprefix=@rootprefix@
-udevlibexecdir=$(rootprefix)/lib/udev
+udevlibexecdir=@udevlibexecdir@
 
 AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/libudev \
diff --git a/src/keymap/Makefile.am b/src/keymap/Makefile.am
index 942009edba..d39313ba82 100644
--- a/src/keymap/Makefile.am
+++ b/src/keymap/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 rootprefix=@rootprefix@
-udevlibexecdir=$(rootprefix)/lib/udev
+udevlibexecdir=@udevlibexecdir@
 udevhomedir = $(udevlibexecdir)
 
 AM_CPPFLAGS = \
diff --git a/src/mtd_probe/Makefile.am b/src/mtd_probe/Makefile.am
index 2c6cca00ae..444caabea7 100644
--- a/src/mtd_probe/Makefile.am
+++ b/src/mtd_probe/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 rootprefix=@rootprefix@
-udevlibexecdir=$(rootprefix)/lib/udev
+udevlibexecdir=@udevlibexecdir@
 
 udevlibexec_PROGRAMS = \
 	mtd_probe
diff --git a/src/scsi_id/Makefile.am b/src/scsi_id/Makefile.am
index 6412692afe..0f8aa69d4a 100644
--- a/src/scsi_id/Makefile.am
+++ b/src/scsi_id/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 rootprefix=@rootprefix@
-udevlibexecdir=$(rootprefix)/lib/udev
+udevlibexecdir=@udevlibexecdir@
 
 AM_CPPFLAGS = \
 	-DVERSION \
diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am
index 1dc738c51c..cf0725a196 100644
--- a/src/udev/Makefile.am
+++ b/src/udev/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 rootprefix=@rootprefix@
-udevlibexecdir=$(rootprefix)/lib/udev
+udevlibexecdir=@udevlibexecdir@
 udevhomedir = $(udevlibexecdir)
 
 AM_CPPFLAGS = \
diff --git a/src/v4l_id/Makefile.am b/src/v4l_id/Makefile.am
index 4569535d8d..071b0f969e 100644
--- a/src/v4l_id/Makefile.am
+++ b/src/v4l_id/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 rootprefix=@rootprefix@
-udevlibexecdir=$(rootprefix)/lib/udev
+udevlibexecdir=@udevlibexecdir@
 
 udevlibexec_PROGRAMS = \
 	v4l_id
-- 
cgit v1.2.3-54-g00ecf