Module: ngircd.git Branch: master Commit: f72e22d3611161af79a7c3240ff4700c0d70eb26 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f72e2...

Author: Alexander Barton alex@barton.de Date: Tue Aug 17 15:59:54 2010 +0200

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

---

configure.in | 2 +- doc/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in index 79ab22a..bdc08e1 100644 --- 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 eba97d9..34dd9c9 100644 --- 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