summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorSimon Howard2010-01-27 19:50:30 +0000
committerSimon Howard2010-01-27 19:50:30 +0000
commit0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e (patch)
tree483f983aacbd9907290cf61f0e3b3afb1b03f7e9 /man
parent3cf74a97261b1a0aceb591b495b0857781918edd (diff)
parenta9e2d244a5a37fed344405e40698de2a2969c12a (diff)
downloadchocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.tar.gz
chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.tar.bz2
chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.zip
Merge from trunk.
Subversion-branch: /branches/opl-branch Subversion-revision: 1829
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