diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-06-16 16:00:01 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-06-16 17:15:12 -0400 |
| commit | 1c05b48f976d89519a327c791a9a2bd7149ad581 (patch) | |
| tree | a9b7026aa7351f5569db44817a330624c7898592 | |
| parent | 2fb99e01f44f7c1dad3fedb0422f2ae39cbd5e49 (diff) | |
| download | xorg-driver-xf86-input-keyboard-1c05b48f976d89519a327c791a9a2bd7149ad581.tar.gz | |
config: restore inputdir automake variable
All input drivers use this variable to set the installation
path of the input module. For this driver, it was changed
in commit 708ecbf8557d9e676e3bb07c1f83170f6d9f7cd7.
One way or another is fine, but breaking a pattern is error prone.
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 9cec886..8aea810 100644 --- a/configure.ac +++ b/configure.ac @@ -53,7 +53,8 @@ AC_ARG_WITH(xorg-module-dir, [Default xorg module directory [[default=$libdir/xorg/modules]]]), [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) -AC_SUBST(moduledir) +inputdir=${moduledir}/input +AC_SUBST(inputdir) # The keyboard driver code is O/S specific case $host_os in diff --git a/src/Makefile.am b/src/Makefile.am index 7713a07..4062f95 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) kbd_drv_la_LTLIBRARIES = kbd_drv.la kbd_drv_la_LDFLAGS = -avoid-version -module kbd_drv_la_SOURCES = kbd.c xf86OSKbd.h xf86Keymap.h atKeynames.h -kbd_drv_ladir = @moduledir@/input +kbd_drv_ladir = @inputdir@ BSD_SRCS = bsd_KbdMap.c bsd_kbd.c bsd_kbd.h at_scancode.c HURD_SRCS = hurd_kbd.c at_scancode.c |