diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2012-11-23 18:56:16 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-11-23 18:56:16 -0500 |
| commit | 6cb86c3a330caedc323599cb11fbed4138958271 (patch) | |
| tree | 6b0f1e44d69ed1d043b23f5f64e9f7e8b9830c07 /src/keymap | |
| parent | e5cc2b881fd1db175b0d80bcccf21ae70857a532 (diff) | |
Propagation of configured installation paths to Makefile.am and .c code
This commit is a continuation of the previous one in which all the configured
paths obtained in configure.ac are propagated to the Makefile.am and .c files
via AM_CPPFLAGS of the form -DUDEV_CONF_FILE=\"$(udevconffile)\". This should
address the issue in
https://github.com/gentoo/eudev/issues/17
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/keymap')
| -rw-r--r-- | src/keymap/Makefile.am | 2 | ||||
| -rw-r--r-- | src/keymap/keymap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/keymap/Makefile.am b/src/keymap/Makefile.am index f21cb80aae..3e3c90f854 100644 --- a/src/keymap/Makefile.am +++ b/src/keymap/Makefile.am @@ -5,7 +5,7 @@ udevlibexecdir=@udevlibexecdir@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/libudev \ -I $(top_srcdir)/src/udev \ - -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" + -DUDEV_LIBEXEC_DIR=\"$(udevlibexecdir)\" udevlibexec_PROGRAMS = \ keymap diff --git a/src/keymap/keymap.c b/src/keymap/keymap.c index 939407fd0b..b350a8cd86 100644 --- a/src/keymap/keymap.c +++ b/src/keymap/keymap.c @@ -429,7 +429,7 @@ int main(int argc, char **argv) if (f) { merge_table(fd, f); } else { - snprintf(keymap_path, sizeof(keymap_path), UDEVLIBEXECDIR "/keymaps/%s", filearg); + snprintf(keymap_path, sizeof(keymap_path), UDEV_LIBEXEC_DIR "/keymaps/%s", filearg); f = fopen(keymap_path, "re"); if (f) merge_table(fd, f); |