diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-08-14 19:58:14 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-08-14 19:58:14 -0400 |
| commit | 976db8a67a3e0462d0a675e2bfb2fe715e715bae (patch) | |
| tree | e4b5195895acb87b5a331990d1bfc4ef589c79e1 /man | |
| parent | dc0afc177521014462baa966359b45d7a40a0c63 (diff) | |
| download | xorg-lib-libXcomposite-976db8a67a3e0462d0a675e2bfb2fe715e715bae.tar.gz | |
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
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'man')
| -rw-r--r-- | man/.gitignore | 3 | ||||
| -rw-r--r-- | man/Makefile.am | 21 |
2 files changed, 3 insertions, 21 deletions
diff --git a/man/.gitignore b/man/.gitignore index c459112..6726abf 100644 --- a/man/.gitignore +++ b/man/.gitignore @@ -1,3 +1,2 @@ -# Add & Override for this directory and it's subdirectories +# Xcomposite.man is generated by xmlto from Xcomposite.xml Xcomposite.man -shadows.DONE diff --git a/man/Makefile.am b/man/Makefile.am index 54eb624..b768742 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -36,28 +36,11 @@ MAINTAINERCLEANFILES = $(libman_PRE) $(Xcomposite_shadowmen): $(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@ -# Substitute system-specific values 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 = .$(LIB_MAN_SUFFIX) .man .xml +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(LIB_MAN_SUFFIX): - $(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ # Generate nroff sources from DocBook/xml |