summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-07-13 02:21:04 +0000
committerKevin E Martin <kem@kem.org>2005-07-13 02:21:04 +0000
commit9e2a5fdbab3897cf3466b2c88dddc410edbb56a6 (patch)
treeb8198b0689e5c7e904b9c097b9fc79be24c51ea6
parent60de355bced56d6af0e21102992e1dce543bce61 (diff)
Update all input drivers to pass distcheck
-rw-r--r--configure.ac5
-rw-r--r--man/Makefile.am2
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index ea38269..b4987e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ AC_INIT([xf86-input-void],
xf86-input-void)
AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -35,7 +36,6 @@ DRIVER_NAME=void
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