diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-07-08 15:21:36 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-07-08 15:22:55 -0700 |
| commit | 14cf5e3d19488f9a36824a01d4aba4a7f5ebc1cd (patch) | |
| tree | 9a4e9ebdb1cc072e30275d92070a254e457333cf | |
| parent | e106f955dfc23798975ef14b3d3400aff39eced9 (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 | 17 |
2 files changed, 8 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index b66b502..912faff 100644 --- a/configure.ac +++ b/configure.ac @@ -29,10 +29,10 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# 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 # Check for progs diff --git a/man/Makefile.am b/man/Makefile.am index 8b7d8e6..9d8a9ac 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -59,18 +59,11 @@ EXTRA_DIST = $(libman_PRE) xv-library-v2.2.txt CLEANFILES = $(libman_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/__libmandirsuffix__/$(LIB_MAN_DIR_SUFFIX)/g' \ - -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' - SUFFIXES = .$(LIB_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +ADDITIONAL_MAN_SUBSTS = \ + -e 's|__libmandirsuffix__|$(LIB_MAN_DIR_SUFFIX)|g' + .man.$(LIB_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) $(ADDITIONAL_MAN_SUBSTS) < $< > $@ |