From 30a8e2d18fe6dc9fac599e2570360ebb27207811 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 8 Jul 2010 15:26:35 -0700 Subject: 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 --- man/Makefile.am | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'man') diff --git a/man/Makefile.am b/man/Makefile.am index 25c68a8..fcdbaf2 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -36,23 +36,11 @@ CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ $(XDGA_shadows:=.@LIB_MAN_SUFFIX@) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \ - -e 's/__xconfigfile__/xorg.conf/g' \ - -e 's/__xservername__/Xorg/g' \ - -e 's/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \ - -e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g' - 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) < $< > $@ # Generate man page shadow files (Replaces InstallManPageAliases from Imake) DGAFUNCS = XDGAQueryExtension \ -- cgit v1.2.3