Uppercased PACKAGE_NAME macro and started using it in some places.

--HG--
branch : HEAD

diff --git a/configure.in b/configure.in
index bdcb3e8c9064971ff09b721e4f6a09cfdaa173b4..46ab89c9a9bbc18a40ccb01154327509e09ba891 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_PREREQ([2.59])
-AC_INIT([dovecot],[1.2.UNSTABLE],[dovecot@dovecot.org])
+AC_INIT([Dovecot],[1.2.UNSTABLE],[dovecot@dovecot.org])
 AC_CONFIG_SRCDIR([src])
 
 AM_INIT_AUTOMAKE
@@ -292,14 +292,14 @@ AC_SUBST(ssldir)
 AC_ARG_WITH(rundir,
 [  --with-rundir=DIR       Runtime data directory (LOCALSTATEDIR/run/dovecot)],
        rundir="$withval",
-       rundir=$localstatedir/run/$PACKAGE_NAME
+       rundir=$localstatedir/run/$PACKAGE
 )
 AC_SUBST(rundir)
 
 AC_ARG_WITH(statedir,
 [  --with-statedir=DIR     Permanent data directory (LOCALSTATEDIR/lib/dovecot)],
        statedir="$withval",
-       statedir=$localstatedir/lib/$PACKAGE_NAME
+       statedir=$localstatedir/lib/$PACKAGE
 )
 AC_SUBST(statedir)
 

diff --git a/src/master/main.c b/src/master/main.c
index f0ed03d4093549e121730fccb2fc92c21f6fe067..75e07271a4bd3d37027164f1595dfa5c89e2ef02 100644 (file)
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -255,7 +255,7 @@ static void main_init(bool log_error)
                i_error("This is Dovecot's error log");
                i_fatal("This is Dovecot's fatal log");
        }
-       i_info("Dovecot v"VERSION" starting up");
+       i_info(PACKAGE_NAME" v"VERSION" starting up");
 
        lib_signals_init();
         lib_signals_set_handler(SIGINT, TRUE, sig_die, NULL);

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index a4a47d422c8b9b4e7f40038562af865c5964d6d1..0e5a11222042aa11fb072e09ae95e5eb26759056 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -201,7 +201,7 @@ struct settings default_settings = {
        MEMBER(login_dir) "login",
        MEMBER(login_executable) NULL,
        MEMBER(login_user) "dovecot",
-       MEMBER(login_greeting) "Dovecot ready.",
+       MEMBER(login_greeting) PACKAGE_NAME" ready.",
        MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c",
        MEMBER(login_log_format) "%$: %s",