diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-08-13 21:04:52 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-08-13 21:04:52 -0700 |
| commit | 57791c8b2192afdf1e4ef335509baec654bffcf0 (patch) | |
| tree | c0c7c0c2bc44417228514f2a2812ad0d75dfa5db | |
| parent | 5a5e5a83b335f4203c927b539d4c8b6ee53719c3 (diff) | |
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: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 6148221..2342006 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,13 +36,9 @@ CLEANFILES = $(appman_DATA) XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 -SED = sed - -MAN_SUBSTS = \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' - 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) < $< > $@ diff --git a/configure.ac b/configure.ac index 3ec49fc..6a1fa7c 100644 --- a/configure.ac +++ b/configure.ac @@ -27,10 +27,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE AC_USE_SYSTEM_EXTENSIONS -# Require xorg-macros 1.4 or later: XORG_DEFAULT_OPTIONS, INSTALL_CMD +# 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 AM_CONFIG_HEADER(config.h) |