Make configure switch "--docdir" work (closes: #108)

diff --git a/configure.in b/configure.in
index 79ab22a9fca60f6274f6c7818f6fc8d6aa4e21dc..bdc08e16a672515bc4cdfcec331de933825f6ad3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -616,7 +616,7 @@ B=`eval echo ${bindir}` ; B=`eval echo ${B}`
 S=`eval echo ${sbindir}` ; S=`eval echo ${S}`
 C=`eval echo ${sysconfdir}` ; C=`eval echo ${C}`
 M=`eval echo ${mandir}` ; M=`eval echo ${M}`
-D=`eval echo ${datadir}/doc/${PACKAGE}` ; D=`eval echo ${D}`
+D=`eval echo ${docdir}` ; D=`eval echo ${D}`
 
 echo "             Target: ${target}"
 test "$target" != "$host" && echo "               Host: ${host}"

diff --git a/doc/Makefile.am b/doc/Makefile.am
index eba97d9e5df08dad06af96c6d903473ec6a35ac3..34dd9c9b7dd6f0d3c5a4e187f65746a10455f2c5 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,7 +19,7 @@ EXTRA_DIST = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \
 maintainer-clean-local:
        rm -f Makefile Makefile.in
 
-docdir = $(datadir)/doc/$(PACKAGE)
+docdir ?= $(datadir)/doc/$(PACKAGE)
 
 documents = $(EXTRA_DIST) ../AUTHORS ../COPYING ../ChangeLog ../INSTALL \
        ../NEWS ../README