diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2012-11-23 13:48:49 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-11-23 13:48:49 -0500 |
| commit | e5cc2b881fd1db175b0d80bcccf21ae70857a532 (patch) | |
| tree | 352c36d21626640c5a7eddf25a42a7db3c656741 /src/udev | |
| parent | ef6fd93e79be3df2ee33085a8f399e616d624c9d (diff) | |
Consolidate configuration of all installation paths into configure.ac
The configuration of the installation paths for various components
was scattered between the main configure.ac file and the various
Makefile.am's. These components are: udev config file, hwdb, keymaps
and force-release keymaps and the rules. This commit consolidates
them all into one point in configure.ac and anticipates the inclusion
of new AM_CPPFLAGS of the form -DHWDB_BIN=@udevhwdbdir@ as upstream
has done, so it is easier to address issues like:
https://github.com/gentoo/eudev/issues/17
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
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 |