summaryrefslogtreecommitdiff
path: root/driver
diff options
context:
space:
mode:
authorAlexandr Shadchin <shadchin@cvs.openbsd.org>2011-11-19 12:42:58 +0000
committerAlexandr Shadchin <shadchin@cvs.openbsd.org>2011-11-19 12:42:58 +0000
commit3375d31741f393c1fe34d5c6a6ea1a8bb0defe0f (patch)
tree1756dfbead318dbc47fd4e09017d0168e43d4d24 /driver
parentdf10e627ab822fd0e9a22ead159aee4e0efeb8e5 (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. It sets the SED env variable with an appropriate sed program path. Use Automake $() for variables in Makefile.am ok matthieu@
Diffstat (limited to 'driver')
-rw-r--r--driver/xf86-input-ws/man/Makefile.am27
1 files changed, 5 insertions, 22 deletions
diff --git a/driver/xf86-input-ws/man/Makefile.am b/driver/xf86-input-ws/man/Makefile.am
index fe8810dfe..c3f1a2232 100644
--- a/driver/xf86-input-ws/man/Makefile.am
+++ b/driver/xf86-input-ws/man/Makefile.am
@@ -14,32 +14,15 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
drivermandir= $(DRIVER_MAN_DIR)
-driverman_PRE= @DRIVER_NAME@.man
-driverman_DATA= $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
+driverman_PRE= $(DRIVER_NAME).man
+driverman_DATA= $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX))
-EXTRA_DIST= @DRIVER_NAME@.man
+EXTRA_DIST= $(DRIVER_NAME).man
CLEANFILES= $(driverman_DATA)
-SED= sed
-
-# 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):
- sed $(MAN_SUBSTS) < $< > $@
+ $(SED) $(MAN_SUBSTS) < $< > $@