Removed unnecessary macro definitions from Makefiles.

--HG--
branch : HEAD

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 3e8a8c7b188adf4b526769d97a7a919a09238798..b1ccf6e6443ddfd79fdbacbad45ec4b94d1bf29a 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -27,7 +27,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-master \
        -DAUTH_MODULE_DIR=\""$(auth_moduledir)"\" \
        -DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \
-       -DPKG_RUNDIR=\""$(rundir)"\" \
        $(AUTH_CFLAGS)
 
 dovecot_auth_LDFLAGS = -export-dynamic

diff --git a/src/dict/Makefile.am b/src/dict/Makefile.am
index 7b18b3e0aa417defccfe1016fb35673b910e3a16..b00eaab33deb176ff0b0139d2ecbcd49a571e71c 100644 (file)
--- a/src/dict/Makefile.am
+++ b/src/dict/Makefile.am
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-settings \
        -I$(top_srcdir)/src/lib-dict \
        -I$(top_srcdir)/src/lib-sql \
-       -DDICT_MODULE_DIR=\""$(moduledir)/dict"\" \
-       -DPKG_RUNDIR=\""$(rundir)"\"
+       -DDICT_MODULE_DIR=\""$(moduledir)/dict"\"
 
 dict_LDFLAGS = -export-dynamic
 

diff --git a/src/lda/Makefile.am b/src/lda/Makefile.am
index f9f17773e613ee103d76d4df87c5aaa5ea06142f..f80c51a596a8749c9ec7185ab9fcfdf1cd8c68aa 100644 (file)
--- a/src/lda/Makefile.am
+++ b/src/lda/Makefile.am
@@ -12,8 +12,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-lda \
        -I$(top_srcdir)/src/lib-storage \
        -I$(top_srcdir)/src/lib-storage/index \
-       -I$(top_srcdir)/src/lib-storage/index/raw \
-       -DPKG_RUNDIR=\""$(rundir)"\"
+       -I$(top_srcdir)/src/lib-storage/index/raw
 
 dovecot_lda_LDFLAGS = -export-dynamic
 

diff --git a/src/lib-master/Makefile.am b/src/lib-master/Makefile.am
index cdb8fefd8a2e8d448d9b45349b0008af61153a58..d0d727a5b3f563aff780d8ceffca4614bf1bcc73 100644 (file)
--- a/src/lib-master/Makefile.am
+++ b/src/lib-master/Makefile.am
@@ -4,8 +4,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-settings \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
-       -DBINDIR=\""$(bindir)"\" \
-       -DPKG_RUNDIR=\""$(rundir)"\"
+       -DBINDIR=\""$(bindir)"\"
 
 libmaster_la_SOURCES = \
        master-auth.c \

diff --git a/src/lib-storage/index/shared/Makefile.am b/src/lib-storage/index/shared/Makefile.am
index df5c2aedcc140226f7a7e12f1b8f3a5a6dada4b3..43a41b521688ebcfc66a21cc872288cdadd17c36 100644 (file)
--- a/src/lib-storage/index/shared/Makefile.am
+++ b/src/lib-storage/index/shared/Makefile.am
@@ -6,8 +6,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-imap \
        -I$(top_srcdir)/src/lib-index \
        -I$(top_srcdir)/src/lib-storage \
-       -I$(top_srcdir)/src/lib-storage/index \
-       -DPKG_RUNDIR=\""$(rundir)"\"
+       -I$(top_srcdir)/src/lib-storage/index
 
 libstorage_shared_la_SOURCES = \
        shared-list.c \

diff --git a/src/lmtp/Makefile.am b/src/lmtp/Makefile.am
index 19cafa1d972fa08041be43e2f8717682b9bb9829..0081f6fc21cd9a48dbb83d5c44bcb9a316b975e8 100644 (file)
--- a/src/lmtp/Makefile.am
+++ b/src/lmtp/Makefile.am
@@ -12,8 +12,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-lda \
        -I$(top_srcdir)/src/lib-storage \
        -I$(top_srcdir)/src/lib-storage/index \
-       -I$(top_srcdir)/src/lib-storage/index/raw \
-       -DPKG_RUNDIR=\""$(rundir)"\"
+       -I$(top_srcdir)/src/lib-storage/index/raw
 
 lmtp_LDFLAGS = -export-dynamic
 

diff --git a/src/login-common/Makefile.am b/src/login-common/Makefile.am
index 80f655e5e124aebc42d28021928aa8f8fac16175..289b9b73e3a9cb2b04e69802675f709a6288ee9b 100644 (file)
--- a/src/login-common/Makefile.am
+++ b/src/login-common/Makefile.am
@@ -5,10 +5,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-settings \
        -I$(top_srcdir)/src/lib-auth \
        -I$(top_srcdir)/src/lib-master \
-       -DPKG_RUNDIR=\""$(rundir)"\" \
-       -DPKG_STATEDIR=\""$(statedir)"\" \
-       -DSBINDIR=\""$(sbindir)"\" \
-       -DSSLDIR=\""$(ssldir)\""
+       -DPKG_STATEDIR=\""$(statedir)"\"
 
 liblogin_la_SOURCES = \
        client-common.c \

diff --git a/src/master/Makefile.am b/src/master/Makefile.am
index 4545b73b8a54a00a912994026030ac0192b60ea2..52eaee536dcf0cda18a2df255d161b01c0de41ec 100644 (file)
--- a/src/master/Makefile.am
+++ b/src/master/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-settings \
        -I$(top_srcdir)/src/lib-master \
-       -DSYSCONFDIR=\""$(sysconfdir)"\" \
        -DPKG_RUNDIR=\""$(rundir)"\" \
        -DPKG_STATEDIR=\""$(statedir)"\" \
        -DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \

diff --git a/src/plugins/convert/Makefile.am b/src/plugins/convert/Makefile.am
index a7a504503e1868591613b4d398556fb6c7889117..65fde185a967ff50d9fa107ccff2462f7ed9a488 100644 (file)
--- a/src/plugins/convert/Makefile.am
+++ b/src/plugins/convert/Makefile.am
@@ -5,8 +5,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-master \
        -I$(top_srcdir)/src/lib-mail \
        -I$(top_srcdir)/src/lib-index \
-       -I$(top_srcdir)/src/lib-storage \
-       -DPKG_RUNDIR=\""$(rundir)"\"
+       -I$(top_srcdir)/src/lib-storage
 
 lib20_convert_plugin_la_LDFLAGS = -module -avoid-version
 

diff --git a/src/plugins/expire/Makefile.am b/src/plugins/expire/Makefile.am
index ad7ba8da11c8ac29ed3fc2b8f65f75cf3946d398..323eb706d645934c18339049c25f96f44a603408 100644 (file)
--- a/src/plugins/expire/Makefile.am
+++ b/src/plugins/expire/Makefile.am
@@ -10,8 +10,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-imap \
        -I$(top_srcdir)/src/lib-index \
        -I$(top_srcdir)/src/lib-storage \
-       -I$(top_srcdir)/src/lib-storage/index \
-       -DPKG_RUNDIR=\""$(rundir)"\"
+       -I$(top_srcdir)/src/lib-storage/index
 
 lib20_expire_plugin_la_LDFLAGS = -module -avoid-version