dovecot-config: Renamed field names to be more consistent.

--HG--
branch : HEAD

diff --git a/Makefile.am b/Makefile.am
index c2b279d9409456a1b845125329edd32210d1b95a..13286e7941734e9b1d25113ea0a0378e158a85dd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,11 +34,11 @@ dovecot-config: dovecot-config.in Makefile
        -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 --git a/dovecot-config.in.in b/dovecot-config.in.in
index d261b02f119f273e58e5b39df9cfc28b6349b177..edc6beb68b082769c98b567e73c17c27490d373c 100644 (file)
--- a/dovecot-config.in.in
+++ b/dovecot-config.in.in
@@ -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_STORAGE_INCLUDE="-I$(incdir)/src/lib-index -I$(incdir)/src/lib-storag
 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=