summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2010-07-08 14:34:18 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2010-07-08 14:34:18 -0700
commit82bc24d6137cc4f03944af88e69c4d67b26d3cc9 (patch)
tree3fd17a1867e9959e0c03b35edcf7ff3c5e24ea4c
parent2e5c60f477fc68634f1fa31a2fc4a166642ab318 (diff)
downloadxorg-lib-libXrandr-82bc24d6137cc4f03944af88e69c4d67b26d3cc9.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.ac6
-rw-r--r--man/Makefile.am12
2 files changed, 4 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index 6e350df..29f509a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,10 +35,10 @@ AC_CONFIG_AUX_DIR(.)
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 4166709..b10470b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -36,20 +36,10 @@ EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-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) < $< > $@
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)