diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-05-27 09:32:59 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-05-27 19:16:21 -0400 |
| commit | 1188152feee345b7a0f39513cd9d7b8bab938338 (patch) | |
| tree | 03b55f8ba610d44d2d1182bc6d797975ab1a0257 | |
| parent | ad78ef7a9488f7235032e106839224fc43f20e5f (diff) | |
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.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
The existing statement can now be removed from the configuration file.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 16 |
2 files changed, 2 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 0cbac9d..a315549 100644 --- a/configure.ac +++ b/configure.ac @@ -40,14 +40,13 @@ AC_PROG_LIBTOOL # Initialize X.Org macros m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.4) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS XORG_WITH_LINT # Checks for programs. AC_PROG_INSTALL -AC_PROG_SED # Obtain compiler/linker options from server and required extensions PKG_CHECK_MODULES(XORG, [xorg-server >= 1.5.99.901] xproto inputproto) diff --git a/man/Makefile.am b/man/Makefile.am index a2514d8..c3b2b90 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -31,22 +31,6 @@ EXTRA_DIST = mousedrv.man CLEANFILES = $(driverman_DATA) -# 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' - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man .man.$(DRIVER_MAN_SUFFIX): |