From b49c573148ef7ebb8e6a49d36e3d121a907bea91 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Sun, 8 Nov 2009 21:43:28 +0100
Subject: [PATCH] Fixed install location of example config.
---
configure.in | 8 ++------
doc/example-config/conf.d/Makefile.am | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/configure.in b/configure.in
index 926dc8e15..ade2b0b3d 100644
--- a/configure.in
+++ b/configure.in
@@ -107,18 +107,14 @@ AC_SUBST(MODULE_LIBS)
AC_SUBST(dovecot_incdir)
AC_SUBST(moduledir)
-if test "$docdir" = ""; then
- dnl docdir supported only by autoconf v2.59c and later
- docdir='${datadir}/doc/dovecot'
-fi
-AC_SUBST(docdir)
-
dovecot_pkglibexecdir='$(libexecdir)/dovecot'
dovecot_pkglibdir='$(libdir)/dovecot'
dovecot_pkgincludedir='$(includedir)/dovecot'
+dovecot_docdir='$(datadir)/dovecot'
AC_SUBST(dovecot_pkglibexecdir)
AC_SUBST(dovecot_pkglibdir)
AC_SUBST(dovecot_pkgincludedir)
+AC_SUBST(dovecot_docdir)
AC_CONFIG_FILES([
Makefile
diff --git a/doc/example-config/conf.d/Makefile.am b/doc/example-config/conf.d/Makefile.am
index 175992957..ba1502246 100644
--- a/doc/example-config/conf.d/Makefile.am
+++ b/doc/example-config/conf.d/Makefile.am
@@ -1,6 +1,6 @@
pkgsysconfdir = $(sysconfdir)/dovecot
-exampledir = $(docdir)/example-config/conf.d
+exampledir = $(dovecot_docdir)/example-config/conf.d
example_DATA = \
sieve.conf
--
GitLab