shithub: choc

Download patch

ref: d44fdfaeee2f4be129c0e2d87ba460fc308e4274
parent: e6deb55e1154a77953c0cc69f79fdea8108f5da6
author: Jan Engelhardt <[email protected]>
date: Tue Dec 10 11:59:42 EST 2013 

build: fix not-honored --docdir setting

Despite using `./configure --docdir=XYZ` and/or `make docdir=XYZ`, the
directory is ignored. Resolve that problem.


--- a/Makefile.am
+++ b/Makefile.am
@@ -49,16 +49,16 @@
         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)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -8,10 +8,10 @@
                     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