diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-10-30 13:41:22 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-10-30 13:42:21 -0700 |
| commit | e581769b5152ff8e8fdf745b66eb81479a380c32 (patch) | |
| tree | afadabd35585cd0cfae1e220a648805f8ac02e8f | |
| parent | 539d89d70ddb16fc3b98968a63276519e737a270 (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
Enables use of platform appropriate version of sed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | man/Makefile.am | 12 |
2 files changed, 4 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index a71e53f..34a79fa 100644 --- a/configure.ac +++ b/configure.ac @@ -12,10 +12,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.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS AC_PROG_CC diff --git a/man/Makefile.am b/man/Makefile.am index 9a52ef2..98e1805 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -31,18 +31,8 @@ EXTRA_DIST = $(appman_PRE) CLEANFILES = $(appman_DATA) -# Strings to replace in man pages -XORGRELSTRING = $(PACKAGE_STRING) - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ |