config: upgrade to util-macros 1.8 for additional man page support

Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.

diff --git a/configure.ac b/configure.ac
index 5b696b5..43f53d2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require 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.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
 # Checks for programs.

diff --git a/man/Makefile.am b/man/Makefile.am
index 8f2454b..b3688ce 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
 
 CLEANFILES = $(driverman_DATA)
 
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-       -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-       -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-       -e 's|__xservername__|Xorg|g' \
-       -e 's|__xconfigfile__|xorg.conf|g' \
-       -e 's|__projectroot__|$(prefix)|g' \
-       -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-       -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-       -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-       -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-       -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+
 
 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 
 .man.$(DRIVER_MAN_SUFFIX):
-       sed $(MAN_SUBSTS) < $< > $@
+       $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@