summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorSimon Howard2010-02-06 03:14:20 +0000
committerSimon Howard2010-02-06 03:14:20 +0000
commitd9520b6415f8e373cf759f316094b986e57f0f5a (patch)
treed256f7d4f1941ec33ae3c956449c70349de7297d /man
parent57011e785808847273461aaf6d8ed1df76ff1db9 (diff)
parent52f81b4ef175358d1e1f7f9eecab2a1edb7f4b65 (diff)
downloadchocolate-doom-d9520b6415f8e373cf759f316094b986e57f0f5a.tar.gz
chocolate-doom-d9520b6415f8e373cf759f316094b986e57f0f5a.tar.bz2
chocolate-doom-d9520b6415f8e373cf759f316094b986e57f0f5a.zip
Merge from trunk.
Subversion-branch: /branches/strife-branch Subversion-revision: 1849
Diffstat (limited to 'man')
-rw-r--r--man/Makefile.am9
1 files changed, 5 insertions, 4 deletions
diff --git a/man/Makefile.am b/man/Makefile.am
index d3c90f7e..698c0862 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -5,9 +5,9 @@ if HAVE_PYTHON
man_MANS=chocolate-doom.6 \
chocolate-server.6 \
- chocolate-setup.6 \
- default.cfg.5 \
- $(PACKAGE).cfg.5
+ chocolate-setup.6 \
+ default.cfg.5 \
+ $(PACKAGE).cfg.5
chocolate-doom.6: ../src $(MANPAGE_GEN_FILES)
./docgen -m manpage.template ../src > $@
@@ -21,5 +21,6 @@ $(PACKAGE).cfg.5: ../src extra.cfg.template
endif
EXTRA_DIST = $(man_MANS) $(MANPAGE_GEN_FILES) \
- wikipages
+ wikipages \
+ CMDLINE.template