diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 6148221..2342006 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,13 +36,9 @@ CLEANFILES = $(appman_DATA) XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 -SED = sed - -MAN_SUBSTS = \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/configure.ac b/configure.ac index 3ec49fc..6a1fa7c 100644 --- a/configure.ac +++ b/configure.ac @@ -27,10 +27,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE AC_USE_SYSTEM_EXTENSIONS -# Require xorg-macros 1.4 or later: XORG_DEFAULT_OPTIONS, INSTALL_CMD +# 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.4 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.4) + [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) |