summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-08-15 12:53:04 -0400
committerGaetan Nadon <memsize@videotron.ca>2010-08-16 11:15:17 -0400
commitbc9f68de51ec7d3d88330ff843eccd6cbf9a93ad (patch)
tree6f5f3f0cdf7ec89a7026dc332d8adbe5884517d3 /man
parent20b843c820dd147a0f8f7e6d06da7a0c18d40f1c (diff)
man: 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 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'man')
-rw-r--r--man/Makefile.am16
1 files changed, 3 insertions, 13 deletions
diff --git a/man/Makefile.am b/man/Makefile.am
index edfc506..4577d82 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -110,7 +110,6 @@ libman_shadows = \
XDeleteDeviceProperty.man \
$(XI2_shadows)
-
# Name of man page files generated from DocBook XML files by xmlto
libman_PRE = $(libman_txt:.txt=.man) $(libman_shadows)
@@ -152,22 +151,13 @@ XIUngrabEnter.man XIGrabFocusIn.man XIUngrabFocusIn.man: XIGrabEnter.man
XIGetSelectedEvents.man: XISelectEvents.man
XIFreeDeviceInfo.man: XIQueryDevice.man
-# 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
# Unable to use __libmansuffix__ as underscores are lost in txt --> xml conversion
-MAN_SUBSTS = \
- -e 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
- -e 's/__xservername__/Xorg/g' \
- -e 's/__xconfigfile__/xorg.conf/g' \
- -e 's/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \
- -e 's/libmansuffix/$(LIB_MAN_SUFFIX)/g' \
- -e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g'
+MAN_SUBSTS += -e 's/libmansuffix/$(LIB_MAN_SUFFIX)/g'
SUFFIXES = .man .$(LIB_MAN_SUFFIX)
.man.$(LIB_MAN_SUFFIX):
- $(SED) $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Generate man pages and shadow pages from .txt and then from DocBook XML
if HAVE_DOCTOOLS