diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/accelerometer/Makefile.am | 1 | ||||
| -rw-r--r-- | src/ata_id/Makefile.am | 1 | ||||
| -rw-r--r-- | src/cdrom_id/Makefile.am | 1 | ||||
| -rw-r--r-- | src/collect/Makefile.am | 1 | ||||
| -rw-r--r-- | src/keymap/Makefile.am | 4 | ||||
| -rw-r--r-- | src/mtd_probe/Makefile.am | 1 | ||||
| -rw-r--r-- | src/scsi_id/Makefile.am | 1 | ||||
| -rw-r--r-- | src/udev/Makefile.am | 9 | ||||
| -rw-r--r-- | src/v4l_id/Makefile.am | 1 |
9 files changed, 5 insertions, 15 deletions
diff --git a/src/accelerometer/Makefile.am b/src/accelerometer/Makefile.am index 46b8801645..9c3e9903f8 100644 --- a/src/accelerometer/Makefile.am +++ b/src/accelerometer/Makefile.am @@ -1,6 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -rootprefix=@rootprefix@ udevlibexecdir=@udevlibexecdir@ AM_CPPFLAGS = \ diff --git a/src/ata_id/Makefile.am b/src/ata_id/Makefile.am index 545daf23ec..f57c90f2e9 100644 --- a/src/ata_id/Makefile.am +++ b/src/ata_id/Makefile.am @@ -1,6 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -rootprefix=@rootprefix@ udevlibexecdir=@udevlibexecdir@ AM_CPPFLAGS = \ diff --git a/src/cdrom_id/Makefile.am b/src/cdrom_id/Makefile.am index 321b23b928..f4cd8b4d33 100644 --- a/src/cdrom_id/Makefile.am +++ b/src/cdrom_id/Makefile.am @@ -1,6 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -rootprefix=@rootprefix@ udevlibexecdir=@udevlibexecdir@ AM_CPPFLAGS = \ diff --git a/src/collect/Makefile.am b/src/collect/Makefile.am index d96cc3946b..37c502aec2 100644 --- a/src/collect/Makefile.am +++ b/src/collect/Makefile.am @@ -1,6 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -rootprefix=@rootprefix@ udevlibexecdir=@udevlibexecdir@ AM_CPPFLAGS = \ diff --git a/src/keymap/Makefile.am b/src/keymap/Makefile.am index d39313ba82..f21cb80aae 100644 --- a/src/keymap/Makefile.am +++ b/src/keymap/Makefile.am @@ -1,8 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -rootprefix=@rootprefix@ udevlibexecdir=@udevlibexecdir@ -udevhomedir = $(udevlibexecdir) AM_CPPFLAGS = \ -I $(top_srcdir)/src/libudev \ @@ -31,7 +29,7 @@ BUILT_SOURCES = \ dist_doc_DATA = \ README.keymap.txt -dist_udevhome_SCRIPTS = \ +dist_udevlibexec_SCRIPTS = \ findkeyboards \ keyboard-force-release.sh diff --git a/src/mtd_probe/Makefile.am b/src/mtd_probe/Makefile.am index 444caabea7..a0af39e642 100644 --- a/src/mtd_probe/Makefile.am +++ b/src/mtd_probe/Makefile.am @@ -1,6 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -rootprefix=@rootprefix@ udevlibexecdir=@udevlibexecdir@ udevlibexec_PROGRAMS = \ diff --git a/src/scsi_id/Makefile.am b/src/scsi_id/Makefile.am index 0f8aa69d4a..058855ff3c 100644 --- a/src/scsi_id/Makefile.am +++ b/src/scsi_id/Makefile.am @@ -1,6 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -rootprefix=@rootprefix@ udevlibexecdir=@udevlibexecdir@ AM_CPPFLAGS = \ diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am index 2486824e86..f353e079a8 100644 --- a/src/udev/Makefile.am +++ b/src/udev/Makefile.am @@ -1,8 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -rootprefix=@rootprefix@ -udevlibexecdir=@udevlibexecdir@ -udevhomedir = $(udevlibexecdir) +rootprefix = @rootprefix@ +udevlibexecdir = @udevlibexecdir@ AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ @@ -133,11 +132,11 @@ libudev_core_la_CPPFLAGS = \ # # Extras # -udevconfdir = $(sysconfdir)/udev +udevconfdir = @udevconfdir@ dist_udevconf_DATA = \ udev.conf -sharepkgconfigdir = $(datadir)/pkgconfig +sharepkgconfigdir = @sharepkgconfigdir@ sharepkgconfig_DATA = \ udev.pc diff --git a/src/v4l_id/Makefile.am b/src/v4l_id/Makefile.am index 071b0f969e..6542598259 100644 --- a/src/v4l_id/Makefile.am +++ b/src/v4l_id/Makefile.am @@ -1,6 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -rootprefix=@rootprefix@ udevlibexecdir=@udevlibexecdir@ udevlibexec_PROGRAMS = \ |