diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-07-08 15:10:27 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-07-08 15:10:27 -0700 |
| commit | 601ea1309d80ba19b4e03207d6fb0f54b2f12730 (patch) | |
| tree | 31fbf57f70054a8c309305897ddca761c17397bc | |
| parent | 672f3ea3431c37ce8f4c33da224287861f64c2a4 (diff) | |
config: Use additional man page support from util-macros 1.8
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-- | man/Makefile.am | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/man/Makefile.am b/man/Makefile.am index f385bf9..e1f9a7e 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -50,24 +50,11 @@ if INSTALL_MANPAGES libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) endif -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \ - -e 's/__xservername__/Xorg/g' \ - -e 's/__xconfigfile__/xorg.conf/g' \ - -e 's/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \ - -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' \ - -e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g' - +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure SUFFIXES = .$(LIB_MAN_SUFFIX) .man .man.$(LIB_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ # This is ugly, but handling of tools with multiple outputs in make is a # huge PITA. The commands below are taken from the automake manual: |