diff options
| author | Jan Engelhardt | 2013-12-10 16:59:42 +0100 |
|---|---|---|
| committer | Jan Engelhardt | 2013-12-10 16:59:42 +0100 |
| commit | d44fdfaeee2f4be129c0e2d87ba460fc308e4274 (patch) | |
| tree | abcd8eb003221b33ada538e64f48c4cd69744105 | |
| parent | e6deb55e1154a77953c0cc69f79fdea8108f5da6 (diff) | |
| download | chocolate-doom-d44fdfaeee2f4be129c0e2d87ba460fc308e4274.tar.gz chocolate-doom-d44fdfaeee2f4be129c0e2d87ba460fc308e4274.tar.bz2 chocolate-doom-d44fdfaeee2f4be129c0e2d87ba460fc308e4274.zip | |
build: fix not-honored --docdir setting
Despite using `./configure --docdir=XYZ` and/or `make docdir=XYZ`, the
directory is ignored. Resolve that problem.
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | 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 |