diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-08-19 20:13:16 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-08-19 20:16:57 -0400 |
| commit | bd575588e3ad149e5a967436f60f2de56cd5dde7 (patch) | |
| tree | bad6dd95fa569f9020a2653a60b7cfce5b20608e | |
| parent | aab6187cadb5a642ec4a7d97daf99ce08d5966ff (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 | 6 | ||||
| -rw-r--r-- | man/general/Makefile.am | 37 |
2 files changed, 15 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac index 388e7b9..d5f55e6 100644 --- a/configure.ac +++ b/configure.ac @@ -25,10 +25,10 @@ AC_INIT([xorg-docs], [1.5], [https://bugs.freedesktop.org/enter_bug.cgi?product= AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.6 or later: XORG_WITH_PS2PDF +# 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.6 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.6) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS DEFAULT_X11DOCDIR=${datadir}/X11/doc diff --git a/man/general/Makefile.am b/man/general/Makefile.am index ebdd71d..74ad43e 100644 --- a/man/general/Makefile.am +++ b/man/general/Makefile.am @@ -22,37 +22,24 @@ miscmandir = $(MISC_MAN_DIR) -miscman_PRE = \ - Consortium.man \ - Xsecurity.man \ - Standards.man \ - X.man \ - XOrgFoundation.man \ +miscman_PRE = \ + Consortium.man \ + Xsecurity.man \ + Standards.man \ + X.man \ + XOrgFoundation.man \ XProjectTeam.man miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@) +EXTRA_DIST = $(miscman_PRE) CLEANFILES = $(miscman_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|__datadir__|$(datadir)|g' \ - -e 's|__libdir__|$(libdir)|g' \ - -e 's|__sysconfdir__|$(sysconfdir)|g' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' - SUFFIXES = .$(MISC_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +MAN_SUBSTS += -e 's|__datadir__|$(datadir)|g' \ + -e 's|__libdir__|$(libdir)|g' \ + -e 's|__sysconfdir__|$(sysconfdir)|g' + .man.$(MISC_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - -EXTRA_DIST = $(miscman_PRE) |