# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1265560281 -7200
# Node ID 3e162b623291f0ef5778c7d9f1dc5cbeb3438570
# Parent  23b91bb080a9fd05d8f43c4eb725856240e606f6
dovecot-config: Renamed field names to be more consistent.

diff -r 23b91bb080a9 -r 3e162b623291 Makefile.am
--- a/Makefile.am	Sun Feb 07 18:17:27 2010 +0200
+++ b/Makefile.am	Sun Feb 07 18:31:21 2010 +0200
@@ -34,11 +34,11 @@
 	-e "s|\$$(top_builddir)|$$abs_builddir|g" \
 	-e "s|\$$(incdir)|$$abs_srcdir|g" \
 	-e "s|\$$(LIBICONV)|$(LIBICONV)|g" \
-	-e "s|^moduledir=|moduledir=$(moduledir)|" \
-	-e "s|^dovecot_pkgincludedir=|dovecot_pkgincludedir=$(pkgincludedir)|" \
-	-e "s|^dovecot_pkglibdir=|dovecot_pkglibdir=$(pkglibdir)|" \
-	-e "s|^dovecot_pkglibexecdir=|dovecot_pkglibexecdir=$(libexecdir)/dovecot|" \
-	-e "s|^dovecot_docdir=|dovecot_docdir=$(docdir)|" \
+	-e "s|^\(DOVECOT_MODULEDIR\)=|\1=$(moduledir)|" \
+	-e "s|^\(DOVECOT_PKGINCLUDEDIR\)=|\1=$(pkgincludedir)|" \
+	-e "s|^\(DOVECOT_PKGLIBDIR\)=|\1=$(pkglibdir)|" \
+	-e "s|^\(DOVECOT_PKGLIBEXECDIR\)=|\1=$(libexecdir)/dovecot|" \
+	-e "s|^\(DOVECOT_DOCDIR\)=|\1=$(docdir)|" \
 	> dovecot-config
 
 if INSTALL_HEADERS
diff -r 23b91bb080a9 -r 3e162b623291 dovecot-config.in.in
--- a/dovecot-config.in.in	Sun Feb 07 18:17:27 2010 +0200
+++ b/dovecot-config.in.in	Sun Feb 07 18:31:21 2010 +0200
@@ -1,6 +1,6 @@
-CFLAGS="@CFLAGS@"
-LIBS="@LIBS@"
-SSL_LIBS="@SSL_LIBS@"
+DOVECOT_CFLAGS="@CFLAGS@"
+DOVECOT_LIBS="@LIBS@"
+DOVECOT_SSL_LIBS="@SSL_LIBS@"
 
 LIBDOVECOT="@LIBDOVECOT@ @MODULE_LIBS@"
 LIBDOVECOT_LOGIN="@LIBDOVECOT_LOGIN@"
@@ -19,8 +19,8 @@
 LIBDOVECOT_LOGIN_INCLUDE="-I$(incdir)/src/lib-auth -I$(incdir)/src/login-common"
 LIBDOVECOT_IMAP_INCLUDE="-I$(incdir)/src/imap"
 
-dovecot_pkgincludedir=
-dovecot_pkglibdir=
-dovecot_pkglibexecdir=
-dovecot_docdir=
-moduledir=
+DOVECOT_PKGINCLUDEDIR=
+DOVECOT_PKGLIBDIR=
+DOVECOT_PKGLIBEXECDIR=
+DOVECOT_DOCDIR=
+DOVECOT_MODULEDIR=