Use the value of MAN_SUBSTS from util-macros for man pages

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/man/Makefile.am b/man/Makefile.am
index 6608ff73c4066531e56ef00c2da24380b9999e8c..6591fe7b1b6d8db5dac5dd983008d39bc0739a2c 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -19,33 +19,15 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 

-

 appmandir = $(APP_MAN_DIR)
 appman_PRE = xinput.man
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
 EXTRA_DIST = $(appman_PRE)
 CLEANFILES = $(appman_DATA)
 appmandir = $(APP_MAN_DIR)
 appman_PRE = xinput.man
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
 EXTRA_DIST = $(appman_PRE)
 CLEANFILES = $(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|__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
 
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 

+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure

 .man.$(APP_MAN_SUFFIX):
        $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 
 .man.$(APP_MAN_SUFFIX):
        $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@