diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-11 23:11:57 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-11 23:11:57 -0800 |
| commit | 5d0f927ae0c580a6c4c3f119576753dc7b547966 (patch) | |
| tree | 1efa318fbd43b18958f59f0df45d79d40ae3933e | |
| parent | b14dc70f4d7d538071b725e3fd453dbfe2b9e0d4 (diff) | |
| download | xorg-lib-libXp-5d0f927ae0c580a6c4c3f119576753dc7b547966.tar.gz | |
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
The existing statement can now be removed from the configuration file.
Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
Enables silent rule and use 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 | 11 |
2 files changed, 5 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index cbff9ed..b0fbc83 100644 --- a/configure.ac +++ b/configure.ac @@ -27,10 +27,10 @@ AC_INIT(libXp, 1.0.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros minimum of 1.3 for 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 AM_CONFIG_HEADER(config.h) diff --git a/man/Makefile.am b/man/Makefile.am index 6ce1990..94c387f 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -66,16 +66,9 @@ CLEANFILES = $(libman_DATA) libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = -e 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' - SUFFIXES = .$(LIB_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(LIB_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ |