diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | hwdb/Makefile.am | 2 | ||||
| -rw-r--r-- | keymaps-force-release/Makefile.am | 2 | ||||
| -rw-r--r-- | keymaps/Makefile.am | 2 | ||||
| -rw-r--r-- | rules/Makefile.am | 2 | ||||
| -rw-r--r-- | src/accelerometer/Makefile.am | 2 | ||||
| -rw-r--r-- | src/ata_id/Makefile.am | 2 | ||||
| -rw-r--r-- | src/cdrom_id/Makefile.am | 2 | ||||
| -rw-r--r-- | src/collect/Makefile.am | 2 | ||||
| -rw-r--r-- | src/keymap/Makefile.am | 2 | ||||
| -rw-r--r-- | src/mtd_probe/Makefile.am | 2 | ||||
| -rw-r--r-- | src/scsi_id/Makefile.am | 2 | ||||
| -rw-r--r-- | src/udev/Makefile.am | 2 | ||||
| -rw-r--r-- | src/v4l_id/Makefile.am | 2 |
14 files changed, 14 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 7df93bfdbe..ad219c6a92 100644 --- a/configure.ac +++ b/configure.ac @@ -273,6 +273,7 @@ AS_IF([test "x${enable_split_usr}" = "xyes"], [ AC_SUBST([rootprefix], [$with_rootprefix]) AC_SUBST([rootlibdir], [$with_rootlibdir]) +AC_SUBST([udevlibexecdir], [${with_rootlibdir}/udev]) # ------------------------------------------------------------------------------ diff --git a/hwdb/Makefile.am b/hwdb/Makefile.am index 833b494ac0..0a173a6637 100644 --- a/hwdb/Makefile.am +++ b/hwdb/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} rootprefix=@rootprefix@ -udevlibexecdir=$(rootprefix)/lib/udev +udevlibexecdir=@udevlibexecdir@ udevhwdbdir = $(udevlibexecdir)/hwdb.d dist_udevhwdb_DATA = \ diff --git a/keymaps-force-release/Makefile.am b/keymaps-force-release/Makefile.am index c17017bf4b..3f9de31414 100644 --- a/keymaps-force-release/Makefile.am +++ b/keymaps-force-release/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} rootprefix=@rootprefix@ -udevlibexecdir=$(rootprefix)/lib/udev +udevlibexecdir=@udevlibexecdir@ udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release dist_udevkeymapforcerel_DATA = \ diff --git a/keymaps/Makefile.am b/keymaps/Makefile.am index f3f1d9adc1..ba53b030a5 100644 --- a/keymaps/Makefile.am +++ b/keymaps/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} rootprefix=@rootprefix@ -udevlibexecdir=$(rootprefix)/lib/udev +udevlibexecdir=@udevlibexecdir@ udevkeymapdir = $(udevlibexecdir)/keymaps dist_udevkeymap_DATA = \ diff --git a/rules/Makefile.am b/rules/Makefile.am index 3587e238f8..8a1f64ff30 100644 --- a/rules/Makefile.am +++ b/rules/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} rootprefix=@rootprefix@ -udevlibexecdir=$(rootprefix)/lib/udev +udevlibexecdir=@udevlibexecdir@ udevrulesdir = $(udevlibexecdir)/rules.d dist_udevrules_DATA = \ 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 |