From 2f16193cb1926f1a1257b53e250598d6bb770eb1 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 23 Jul 2010 13:58:46 -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 Use platform appropriate version of sed. Signed-off-by: Alan Coopersmith --- Makefile.am | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 6457d95..a292290 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,30 +51,15 @@ ChangeLog: dist-hook: ChangeLog INSTALL -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +setxkbmap_MAN_SUBSTS = \ -e 's|__xkbconfigroot__|"$(XKBCONFIGROOT)"|' \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' + $(MAN_SUBSTS) SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(setxkbmap_MAN_SUBSTS) < $< > $@ if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- cgit v1.2.3