diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | man/Makefile.am | 13 |
2 files changed, 6 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 7fe7864..b4f4bbd 100644 --- a/configure.ac +++ b/configure.ac @@ -34,10 +34,10 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# 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 # Check for progs diff --git a/man/Makefile.am b/man/Makefile.am index abb555d..b306de2 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -13,18 +13,11 @@ SUFFIXES = .$(LIB_MAN_SUFFIX) .man # Strings to replace in man pages XORGRELSTRING = @PACKAGE_STRING@ -MAN_SUBSTS = \ - -e 's|__xorgversion__|"$(XORGRELSTRING)"|' \ - -e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g' \ - -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' +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +MAN_SUBSTS = -e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g' .man.$(LIB_MAN_SUFFIX): - -rm -f $@ - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ # Generate man page shadow files |