diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2010-08-08 21:45:54 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-08-09 10:04:16 -0400 |
| commit | be56a72e4afc0ba6599fb862f2b527fa49afbf82 (patch) | |
| tree | 4e0b9866d8c2e71f084823331ca9faa27349e0e1 | |
| parent | 0aa3f45edaddd3deef9845ed290518ebb91e22c0 (diff) | |
Use AC_PROG_SED and MAN_SUBSTS in macros-1.8
Tested-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 4 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 8647caa..75e7a33 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,16 +25,7 @@ ChangeLog: dist-hook: ChangeLog INSTALL -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -SED = sed - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure SUFFIXES = .$(APP_MAN_SUFFIX) .man diff --git a/configure.ac b/configure.ac index 7a57230..adb24e1 100644 --- a/configure.ac +++ b/configure.ac @@ -5,10 +5,10 @@ AC_INIT(xcursorgen, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require xorg-macros 1.8 or later: 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) AM_CONFIG_HEADER(config.h) |