summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-07-13 02:21:00 +0000
committerKevin E Martin <kem@kem.org>2005-07-13 02:21:00 +0000
commitdd502f26823f705e971a1ecbb0f60c416fd8f30f (patch)
tree235378676df75ce8006d4450588d65d823977643
parente68b1ef4c25c1659121b5be44dff985544392020 (diff)
Update all input drivers to pass distcheck
-rw-r--r--configure.ac7
-rw-r--r--man/Makefile.am2
2 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index a23e610..02db191 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,15 +27,15 @@ AC_INIT([xf86-input-jamstudio],
xf86-input-jamstudio)
AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-DRIVER_NAME=jamstudio
+DRIVER_NAME=js_x
AC_SUBST([DRIVER_NAME])
AM_CONFIG_HEADER([config.h])
-AC_CONFIG_AUX_DIR(.)
# Checks for programs.
AC_PROG_LIBTOOL
@@ -62,13 +62,12 @@ AH_TOP([#include "xorg-server.h"])
#fi
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, xorg-server)
+PKG_CHECK_MODULES(XORG, xorg-server xproto)
inputdir=$(pkg-config --variable=moduledir xorg-server)/input
AC_SUBST([inputdir])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
diff --git a/man/Makefile.am b/man/Makefile.am
index 037c760..9ecb395 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -18,4 +18,4 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-man_MANS = @DRIVER_NAME@.4
+dist_man_MANS = @DRIVER_NAME@.4