commit d44fdfaeee2f4be129c0e2d87ba460fc308e4274
Author: Jan Engelhardt <jengelh@inai.de>
AuthorDate: Tue Dec 10 16:59:42 2013 +0100
Commit: Jan Engelhardt <jengelh@inai.de>
CommitDate: Tue Dec 10 16:59:42 2013 +0100
build: fix not-honored --docdir setting
Despite using `./configure --docdir=XYZ` and/or `make docdir=XYZ`, the
directory is ignored. Resolve that problem.
---
Makefile.am | 8 ++++----
man/Makefile.am | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index baffade5..50a485a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,16 +49,16 @@ EXTRA_DIST= \
TODO \
rpm.spec
-doomdocsdir = $(prefix)/share/doc/@PROGRAM_PREFIX@doom
+doomdocsdir = ${docdir}/../${PROGRAM_PREFIX}doom
doomdocs_DATA = $(DOC_FILES) NOT-BUGS
-hereticdocsdir = $(prefix)/share/doc/@PROGRAM_PREFIX@heretic
+hereticdocsdir = ${docdir}/../${PROGRAM_PREFIX}heretic
hereticdocs_DATA = $(DOC_FILES)
-hexendocsdir = $(prefix)/share/doc/@PROGRAM_PREFIX@hexen
+hexendocsdir = ${docdir}/../${PROGRAM_PREFIX}hexen
hexendocs_DATA = $(DOC_FILES)
-strifedocsdir = $(prefix)/share/doc/@PROGRAM_PREFIX@strife
+strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife
strifedocs_DATA = $(DOC_FILES) README.Strife
MAINTAINERCLEANFILES = $(AUX_DIST_GEN)
diff --git a/man/Makefile.am b/man/Makefile.am
index 5ce28ff8..8716d6d4 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -8,10 +8,10 @@ MANPAGE_GEN_FILES = environ.man \
default.cfg.template \
extra.cfg.template
-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
+doomdocsdir = ${docdir}/../${PROGRAM_PREFIX}doom
+hereticdocsdir = ${docdir}/../${PROGRAM_PREFIX}heretic
+hexendocsdir = ${docdir}/../${PROGRAM_PREFIX}hexen
+strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife
if HAVE_PYTHON