dovecot-2.0: dovecot-config: Renamed DOVECOT_*DIR to dovecot_*di...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/4458ce041538
changeset: 10687:4458ce041538
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Feb 10 16:02:26 2010 +0200
description:
dovecot-config: Renamed DOVECOT_*DIR to dovecot_*dir after all.
This makes using them easier in Makefile.ams as install destination paths.

diffstat:

2 files changed, 10 insertions(+), 10 deletions(-)
Makefile.am          |   10 +++++-----
dovecot-config.in.in |   10 +++++-----

diffs (37 lines):

diff -r 442c980d6221 -r 4458ce041538 Makefile.am
--- a/Makefile.am	Tue Feb 09 20:07:49 2010 +0200
+++ b/Makefile.am	Wed Feb 10 16:02:26 2010 +0200
@@ -34,11 +34,11 @@ dovecot-config: dovecot-config.in Makefi
 	-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 -r 442c980d6221 -r 4458ce041538 dovecot-config.in.in
--- a/dovecot-config.in.in	Tue Feb 09 20:07:49 2010 +0200
+++ b/dovecot-config.in.in	Wed Feb 10 16:02:26 2010 +0200
@@ -19,8 +19,8 @@ LIBDOVECOT_LOGIN_INCLUDE="-I$(incdir)/sr
 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=