From: Timo Sirainen <tss@iki.fi>
Date: Wed, 10 Feb 2010 14:02:26 +0000 (+0200)
Subject: dovecot-config: Renamed DOVECOT_*DIR to dovecot_*dir after all.
X-Git-Tag: 2.0.beta3~111
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=650f4afac9bd8cfa889cbb62e39b7490f5a628fb;p=thirdparty%2Fdovecot%2Fcore.git

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 13286e7941..6af6295fbd 100644
--- 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 edc6beb68b..9358bbbeb2 100644
--- 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=