diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-05-27 19:34:40 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-06-16 15:15:43 -0400 |
| commit | 7a08e526ad7ebe2702269d5a0a048f62b1bfbca1 (patch) | |
| tree | c3b10f092b6013a7104a85ec662b95c240d52ddb | |
| parent | e4976108867158f0c90cd1023595f858bea1ea56 (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
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | man/Makefile.am | 16 |
2 files changed, 2 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 8d37120..ca0deb0 100644 --- a/configure.ac +++ b/configure.ac @@ -39,8 +39,8 @@ 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 # Checks for programs. diff --git a/man/Makefile.am b/man/Makefile.am index c020b58..d10f548 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -32,22 +32,6 @@ EXTRA_DIST = @DRIVER_NAME@.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): |