diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-07-20 16:15:29 -0400 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-09-12 03:28:08 +0100 |
| commit | 8cb8d9359e0eec68fd27a57e4f643223290c942d (patch) | |
| tree | ae4491983b325c0bd99aab51ebd5744e9b287bfe /man | |
| parent | 2bdf80aaf51c84d1c374e6a27136349264b0e9bf (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.
(cherry picked from commit 2d85efaa36791bd441f069b612ee86387353d1ed)
Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
Diffstat (limited to 'man')
| -rw-r--r-- | man/Makefile.am | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/man/Makefile.am b/man/Makefile.am index 7b687e47..9ca5ff6e 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -28,23 +28,10 @@ EXTRA_DIST = $(DRIVER_NAME).man CLEANFILES = $(driverman_DATA) -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -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 .man.$(DRIVER_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ |