aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-09-24 10:10:29 +0000
committermarha <marha@users.sourceforge.net>2010-09-24 10:10:29 +0000
commit84b35d18d0b84909f7216fc6a7487ffa72bd3f18 (patch)
treea6a1cf67169f65d2b680c6d3f548d45901284aff /xkbcomp/Makefile.am
parent6a14682c40a85bbfdb5023a3330e95a3a3c0ad03 (diff)
downloadvcxsrv-84b35d18d0b84909f7216fc6a7487ffa72bd3f18.tar.gz
vcxsrv-84b35d18d0b84909f7216fc6a7487ffa72bd3f18.tar.bz2
vcxsrv-84b35d18d0b84909f7216fc6a7487ffa72bd3f18.zip
xserver xkbcomp libxcb pixman git update 24/9/2010
Diffstat (limited to 'xkbcomp/Makefile.am')
-rw-r--r--xkbcomp/Makefile.am22
1 files changed, 2 insertions, 20 deletions
diff --git a/xkbcomp/Makefile.am b/xkbcomp/Makefile.am
index 31c78e023..3ef361dbd 100644
--- a/xkbcomp/Makefile.am
+++ b/xkbcomp/Makefile.am
@@ -76,29 +76,11 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
CLEANFILES = $(appman_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|__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 = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.PHONY: ChangeLog INSTALL