diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-08-22 10:07:24 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-08-22 10:14:58 -0400 |
| commit | 12f82890d64013cc35db25f48c35146ae2ae1b79 (patch) | |
| tree | bd8aa89e4935fa131252e6bb0ffba57670637dec | |
| parent | b93e0ecfd0ed7b38cbc976d584318e11369ef988 (diff) | |
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 the appropriate platform version of sed
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | man/Makefile.am | 22 |
2 files changed, 6 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index 5082131..c740c45 100644 --- a/configure.ac +++ b/configure.ac @@ -27,17 +27,16 @@ AC_INIT(libAppleWM, 1.4.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=x 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) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -AC_PROG_SED # Check for dependencies PKG_CHECK_MODULES(APPLEWM, x11 xext xextproto [applewmproto >= 1.4]) diff --git a/man/Makefile.am b/man/Makefile.am index 1f5f970..f4a45f2 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -25,26 +25,10 @@ libman_DATA = $(libman_PRE:man=$(LIB_MAN_SUFFIX)) EXTRA_DIST = $(libman_PRE) CLEANFILES = $(libman_DATA) - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|XQuartz|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' - SUFFIXES = .$(LIB_MAN_SUFFIX) .man +APPLE_MAN_SUBSTS = -e 's|__xservername__|XQuartz|g' $(MAN_SUBSTS) +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(LIB_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(APPLE_MAN_SUBSTS) < $< > $@ |