summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-06-17 11:15:44 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-06-17 11:15:44 +1000
commit2c8ba519471cf1a4d0ab0f2cac61359426eaa0c7 (patch)
treed0e859012223d86dbc8121871d10eec5684a95a3
parentbef44f01603e1a337b9dc08b5dd37664f9237bab (diff)
parent22a2c7feb18a18a700a736c3f4a65951dbebe990 (diff)
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-synaptics
-rw-r--r--configure.ac2
-rw-r--r--man/Makefile.am1
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 34e8d83..f78d028 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ AM_MAINTAINER_MODE
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-# Initialize X.Org macros
+# Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
diff --git a/man/Makefile.am b/man/Makefile.am
index 23fcf1d..79dba76 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -40,6 +40,7 @@ CLEANFILES = $(driverman_DATA) $(synclientman_DATA) $(syndaemonman_DATA)
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(DRIVER_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.man.$(APP_MAN_SUFFIX):