diff options
| author | Guillem Jover <guillem@hadrons.org> | 2010-10-20 09:41:52 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@hadrons.org> | 2010-10-21 05:28:26 +0200 |
| commit | 56d40816921ab4adf09809e0524347c58d4309ff (patch) | |
| tree | 17bdaf8f07010de8acfb6b551854e8aff9e6c77d | |
| parent | bb02364036554a273bbcec8d7eeaee9865e9390f (diff) | |
build: Use new man page support from xorg-macros 1.8
Use MAN_SUBST and SED now set by XORG_MANPAGE_SECTIONS.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | man/Makefile.am | 19 |
2 files changed, 4 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index 71ebd0d..6adf6f6 100644 --- a/configure.ac +++ b/configure.ac @@ -35,10 +35,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros version 1.3.0 or newer for XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTION m4_ifndef([XORG_MACROS_VERSION], - [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [AC_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 55b3b7c..fb68acd 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -30,24 +30,7 @@ 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|__moduledir__|$(moduledir)|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 |