[PATCH input-keyboard 4/4] config: restore inputdir automake variable

[Gaetan Nadon]

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.
Also restore the use of DRIVER_NAME variable.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac    |    3 ++-
 src/Makefile.am |   16 ++++++++--------
 2 files changed, 10 insertions(+), 9 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..6793846 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,10 +20,10 @@
 
 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
+ at DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME at _drv.la
+ at DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
+ at DRIVER_NAME@_drv_la_SOURCES = kbd.c xf86OSKbd.h xf86Keymap.h atKeynames.h
+ at DRIVER_NAME@_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
@@ -31,19 +31,19 @@ LINUX_SRCS = lnx_KbdMap.c lnx_kbd.c lnx_kbd.h at_scancode.c
 SOLARIS_SRCS = sun_kbd.c sun_kbd.h sun_kbdMap.c
 
 if BSD
-kbd_drv_la_SOURCES += $(BSD_SRCS)
+ at DRIVER_NAME@_drv_la_SOURCES += $(BSD_SRCS)
 endif
 
 if SOLARIS
-kbd_drv_la_SOURCES += $(SOLARIS_SRCS)
+ at DRIVER_NAME@_drv_la_SOURCES += $(SOLARIS_SRCS)
 endif
 
 if LINUX
-kbd_drv_la_SOURCES += $(LINUX_SRCS)
+ at DRIVER_NAME@_drv_la_SOURCES += $(LINUX_SRCS)
 endif
 
 if HURD
-kbd_drv_la_SOURCES += $(HURD_SRCS)
+ at DRIVER_NAME@_drv_la_SOURCES += $(HURD_SRCS)
 endif
 
 EXTRA_DIST = $(BSD_SRCS) $(HURD_SRCS) $(LINUX_SRCS) $(SOLARIS_SRCS)
-- 
1.6.0.4