[PATCH 05/10] xf86-input-acecad: Avoid AC_SUBST() when not really required.

[Paulo Cesar Pereira de Andrade]

  This not only allows a sligthly cleaner configure.ac, but also
allows setting variables values in the make command line.

Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
---
 configure.ac    |    3 ---
 man/Makefile.am |    4 ++--
 src/Makefile.am |   10 +++++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index f5c1e7e..6231da2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,9 +32,6 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
 
-DRIVER_NAME=acecad
-AC_SUBST([DRIVER_NAME])
-
 AM_CONFIG_HEADER([config.h])
 
 # Checks for programs.
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..1a10ce7 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,11 +27,11 @@
 
 drivermandir = $(DRIVER_MAN_DIR)
 
-driverman_PRE = @DRIVER_NAME at .man
+driverman_PRE = acecad.man
 
 driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
 
-EXTRA_DIST = @DRIVER_NAME at .man
+EXTRA_DIST = acecad.man
 
 CLEANFILES = $(driverman_DATA)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 65b449b..e234422 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,13 +24,13 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
- at DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME at _drv.la
- at DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
+acecad_drv_la_LTLIBRARIES = acecad_drv.la
+acecad_drv_la_LDFLAGS = -module -avoid-version
 
 if HAVE_LIBSYSFS
- at DRIVER_NAME@_drv_la_LIBADD = -lsysfs
+acecad_drv_la_LIBADD = -lsysfs
 endif
 
- at DRIVER_NAME@_drv_ladir = @inputdir@
+acecad_drv_ladir = @inputdir@
 
- at DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME at .c @DRIVER_NAME at .h
+acecad_drv_la_SOURCES = acecad.c acecad.h
-- 
1.6.1.3