diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-10-19 20:20:02 -0400 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2010-10-21 14:47:02 +0200 |
| commit | d060a173af59cfde74aa5aa9a59557f509022421 (patch) | |
| tree | 5d03af2ce25f600d7e050a53779154dd3eced8e7 | |
| parent | 61944e4497a65370716fa067f4b6a8643d089a24 (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
Use the appropriate platform version of sed
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | man/Makefile.am | 21 |
2 files changed, 4 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index d5b89c6..9d42e24 100644 --- a/configure.ac +++ b/configure.ac @@ -32,10 +32,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.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 DRIVER_NAME=vmmouse @@ -47,7 +47,6 @@ AM_CONFIG_HEADER([config.h]) AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC -AC_PROG_SED AH_TOP([#include "xorg-server.h"]) diff --git a/man/Makefile.am b/man/Makefile.am index d59d374..42ef841 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -22,9 +22,7 @@ # drivermandir = $(DRIVER_MAN_DIR) - driverman_PRE = @DRIVER_NAME@.man - driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) appmandir = $(APP_MAN_DIR) @@ -32,27 +30,10 @@ appman_PRE = @DRIVER_NAME@_detect.man appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST = @DRIVER_NAME@.man $(appman_PRE) - CLEANFILES = $(driverman_DATA) $(appman_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 +# 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): |