diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-07-07 15:10:34 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-07-07 15:10:34 -0700 |
| commit | db8beb3d19f152a87249fa91c957e4782f47df77 (patch) | |
| tree | 97d4539d71a3e2a97abe7529fcfdc25d852143ad | |
| parent | 309745fc0095cccc575ead3446480060091161f1 (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
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 | 12 |
2 files changed, 4 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index f9024b7..79da4ff 100644 --- a/configure.ac +++ b/configure.ac @@ -27,10 +27,10 @@ AC_INIT(libdmx, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] 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 AM_CONFIG_HEADER(config.h) diff --git a/man/Makefile.am b/man/Makefile.am index e36d73a..c1027c0 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -46,17 +46,7 @@ EXTRA_DIST = $(libman_PRE) 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/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' - SUFFIXES = .$(LIB_MAN_SUFFIX) .man .man.$(LIB_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ |