diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-19 19:42:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-19 19:42:41 +0000 |
| commit | cdc60fdcddbe5666aac11af34c6c030d4a670b99 (patch) | |
| tree | 4ec58bc0728308be9921485d5e79979bbc65a9b1 /xorg-server/doc/man | |
| parent | 800da6ed70c65f5059726b7ce35030e9c7235f01 (diff) | |
| parent | a13b75f056f9f9efcf6ecb8610b40ddbbb2bbb69 (diff) | |
| download | vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.tar.gz vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.tar.bz2 vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/doc/man')
| -rw-r--r-- | xorg-server/doc/man/Makefile.am | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/xorg-server/doc/man/Makefile.am b/xorg-server/doc/man/Makefile.am index 5259a104f..71d704917 100644 --- a/xorg-server/doc/man/Makefile.am +++ b/xorg-server/doc/man/Makefile.am @@ -1,20 +1,6 @@ -# Xserver.man covers options generic to all X servers built in this tree
-# (i.e. those handled in the os/utils.c options processing instead of in
-# the DDX-level options processing)
-
-appmandir = $(APP_MAN_DIR)
-appman_PRE = Xserver.man
-appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
-
-EXTRA_DIST = $(appman_PRE)
-CLEANFILES = $(appman_DATA)
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-# 's|/,|/, |g' will add a space to help font path formatting
-MAN_SUBSTS += -e 's|__datadir__|$(datadir)|g' \
- -e 's|__default_font_path__|$(COMPILEDDEFAULTFONTPATH)|g' \
- -e '\|$(COMPILEDDEFAULTFONTPATH)| s|/,|/, |g'
-
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+# Xserver.man covers options generic to all X servers built in this tree +# (i.e. those handled in the os/utils.c options processing instead of in +# the DDX-level options processing) + +include $(top_srcdir)/manpages.am +appman_PRE = Xserver.man |