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@
This commit is contained in:
shadchin
2011-11-19 12:42:57 +00:00
parent 3734bac4a5
commit 15c3974226

View File

@@ -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) < $< > $@