On 10/20/2010 02:20 AM, Gaetan Nadon wrote:
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<mems...@videotron.ca>
Build-tested on servers 1.0 through 1.9. Please add the below Acked-by
and push.
Acked-by: Thomas Hellstrom <thellst...@vmware.com>
---
configure.ac | 7 +++----
man/Makefile.am | 21 +--------------------
2 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8c1322c..9434d20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,10 +32,10 @@ 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.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
DRIVER_NAME=vmmouse
@@ -47,7 +47,6 @@ AM_CONFIG_HEADER([config.h])
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
-AC_PROG_SED
AH_TOP([#include "xorg-server.h"])
diff --git a/man/Makefile.am b/man/Makefile.am
index d59d374..42ef841 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -22,9 +22,7 @@
#
drivermandir = $(DRIVER_MAN_DIR)
-
driverman_PRE = @driver_n...@.man
-
driverman_DATA = $(driverman_PRE:m...@driver_man_suffix@)
appmandir = $(APP_MAN_DIR)
@@ -32,27 +30,10 @@ appman_PRE = @driver_n...@_detect.man
appman_DATA = $(appman_PRE:m...@app_man_suffix@)
EXTRA_DIST = @driver_n...@.man $(appman_PRE)
-
CLEANFILES = $(driverman_DATA) $(appman_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__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__drivermansuffix__|$(DRIVER_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 = .$(DRIVER_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(DRIVER_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS)< $< > $@
.man.$(APP_MAN_SUFFIX):
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
