dovecot-config: Renamed DOVECOT_*DIR to dovecot_*dir after all.

This makes using them easier in Makefile.ams as install destination paths.

--HG--
branch : HEAD

diff --git a/Makefile.am b/Makefile.am
index 13286e7941734e9b1d25113ea0a0378e158a85dd..6af6295fbd6c8ad755cce337596b0e84338b764f 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|^\(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)|" \
+       -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)|" \
+       -e "s|^\(dovecot_moduledir\)=|\1=$(moduledir)|" \
        > dovecot-config
 
 if INSTALL_HEADERS

diff --git a/dovecot-config.in.in b/dovecot-config.in.in
index edc6beb68b082769c98b567e73c17c27490d373c..9358bbbeb25780e759eb844804faee20ea887ec2 100644 (file)
--- a/dovecot-config.in.in
+++ b/dovecot-config.in.in
@@ -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=
-DOVECOT_MODULEDIR=
+dovecot_pkgincludedir=
+dovecot_pkglibdir=
+dovecot_pkglibexecdir=
+dovecot_docdir=
+dovecot_moduledir=