commit a853a1ef6298dbd7b99d486a0799d5df45181a56
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Sep 21 04:35:48 2013 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sat Sep 21 04:35:48 2013 +0000
Install documentation files into separate directories, one for each
game. This will allow for easier Unix packaging.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2672
---
Makefile.am | 17 ++++++++++++-----
man/Makefile.am | 44 +++++++++++++++++++++++---------------------
2 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d32d426e..ac559231 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,10 +34,8 @@ CODEBLOCKS_FILES= \
DOC_FILES= \
README \
README.OPL \
- README.Strife \
NEWS \
- ChangeLog \
- NOT-BUGS
+ ChangeLog
EXTRA_DIST= \
$(AUX_DIST_GEN) \
@@ -49,8 +47,17 @@ EXTRA_DIST= \
TODO \
rpm.spec
-docdir=$(prefix)/share/doc/@PACKAGE@
-doc_DATA=$(DOC_FILES)
+doomdocsdir = $(prefix)/share/doc/@PROGRAM_PREFIX@doom
+doomdocs_DATA = $(DOC_FILES) NOT-BUGS
+
+hereticdocsdir = $(prefix)/share/doc/@PROGRAM_PREFIX@heretic
+hereticdocs_DATA = $(DOC_FILES)
+
+hexendocsdir = $(prefix)/share/doc/@PROGRAM_PREFIX@hexen
+hexendocs_DATA = $(DOC_FILES)
+
+strifedocsdir = $(prefix)/share/doc/@PROGRAM_PREFIX@strife
+strifedocs_DATA = $(DOC_FILES) README.Strife
MAINTAINERCLEANFILES = $(AUX_DIST_GEN)
diff --git a/man/Makefile.am b/man/Makefile.am
index 17ffbe22..a6cabbaa 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -8,30 +8,32 @@ MANPAGE_GEN_FILES=\
default.cfg.template \
extra.cfg.template
-docdir=$(prefix)/share/doc/@PACKAGE@
+doomdocsdir = $(prefix)/share/doc/@PROGRAM_PREFIX@doom
+hereticdocsdir = $(prefix)/share/doc/@PROGRAM_PREFIX@heretic
+hexendocsdir = $(prefix)/share/doc/@PROGRAM_PREFIX@hexen
+strifedocsdir = $(prefix)/share/doc/@PROGRAM_PREFIX@strife
if HAVE_PYTHON
-man_MANS=chocolate-server.6 \
- chocolate-setup.6 \
- chocolate-doom.6 \
- default.cfg.5 \
- chocolate-doom.cfg.5 \
- chocolate-heretic.6 \
- heretic.cfg.5 \
- chocolate-heretic.cfg.5 \
- chocolate-hexen.6 \
- hexen.cfg.5 \
- chocolate-hexen.cfg.5 \
- chocolate-strife.6 \
- strife.cfg.5 \
- chocolate-strife.cfg.5
-
-nodist_doc_DATA=INSTALL \
- INSTALL.doom INSTALL.heretic INSTALL.hexen INSTALL.strife \
- CMDLINE.doom CMDLINE.heretic CMDLINE.hexen CMDLINE.strife
-
-
+man_MANS = chocolate-server.6 \
+ chocolate-setup.6 \
+ chocolate-doom.6 \
+ default.cfg.5 \
+ chocolate-doom.cfg.5 \
+ chocolate-heretic.6 \
+ heretic.cfg.5 \
+ chocolate-heretic.cfg.5 \
+ chocolate-hexen.6 \
+ hexen.cfg.5 \
+ chocolate-hexen.cfg.5 \
+ chocolate-strife.6 \
+ strife.cfg.5 \
+ chocolate-strife.cfg.5
+
+doomdocs_DATA = INSTALL.doom CMDLINE.doom
+hereticdocs_DATA = INSTALL.heretic CMDLINE.heretic
+hexendocs_DATA = INSTALL.hexen CMDLINE.hexen
+strifedocs_DATA = INSTALL.strife CMDLINE.strife
chocolate-doom.6: ../src $(MANPAGE_GEN_FILES)
./docgen -g doom -m doom.template ../src ../src/doom > $@