Get rid of imap/, pop3/, lda/ and sql/ module subdirs. It's all in lib/dovecot/ now.

--HG--
branch : HEAD

diff --git a/src/deliver/deliver-settings.c b/src/deliver/deliver-settings.c
index bf995802c03cf9301c5d4e3c1c50940ec4d709ef..c19783077c26c08a913cd0235087f19647783529 100644 (file)
--- a/src/deliver/deliver-settings.c
+++ b/src/deliver/deliver-settings.c
@@ -57,7 +57,7 @@ static struct deliver_settings deliver_default_settings = {
        MEMBER(version_ignore) FALSE,
 
        MEMBER(mail_plugins) "",
-       MEMBER(mail_plugin_dir) MODULEDIR"/lda",
+       MEMBER(mail_plugin_dir) MODULEDIR,
 
        MEMBER(mail_uid) "",
        MEMBER(mail_gid) "",

diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c
index 82270840db3d88887063c8667c375a2f809f8277..95aa6e8ba95d00f526a7a12bf989b03894dce96b 100644 (file)
--- a/src/imap/imap-settings.c
+++ b/src/imap/imap-settings.c
@@ -48,7 +48,7 @@ static struct imap_settings imap_default_settings = {
        MEMBER(verbose_proctitle) FALSE,
 
        MEMBER(mail_plugins) "",
-       MEMBER(mail_plugin_dir) MODULEDIR"/imap",
+       MEMBER(mail_plugin_dir) MODULEDIR,
 
        /* RFC-2683 recommends at least 8000 bytes. Some clients however don't
           break large message sets to multiple commands, so we're pretty

diff --git a/src/lib-sql/Makefile.am b/src/lib-sql/Makefile.am
index c1178d285bb571ae7a1ff6e3c7ec8629c87d826d..74996324a18778c320587fe5830e51b7f6226408 100644 (file)
--- a/src/lib-sql/Makefile.am
+++ b/src/lib-sql/Makefile.am
@@ -21,7 +21,7 @@ sql_module_LTLIBRARIES = \
        $(PGSQL_LIB) \
        $(SQLITE_LIB)
 
-sql_moduledir = $(moduledir)/sql
+sql_moduledir = $(moduledir)
 endif
 
 sql_drivers = @sql_drivers@
@@ -104,7 +104,7 @@ install-exec-local:
          $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
          for driver in $(SQL_DRIVER_PLUGINS); do \
            rm -f $(DESTDIR)$(moduledir)/$$d/libdriver_$$driver.so; \
-           $(LN_S) ../sql/libdriver_$$driver.so $(DESTDIR)$(moduledir)/$$d; \
+           $(LN_S) ../libdriver_$$driver.so $(DESTDIR)$(moduledir)/$$d; \
          done; \
        done
 endif

diff --git a/src/plugins/acl/Makefile.am b/src/plugins/acl/Makefile.am
index f60da78612ea4d99005275b6d66e878b728b5351..63083df0da4249a64b656d41d79a689a8fec1829 100644 (file)
--- a/src/plugins/acl/Makefile.am
+++ b/src/plugins/acl/Makefile.am
@@ -33,10 +33,3 @@ noinst_HEADERS = \
        acl-plugin.h \
        acl-shared-storage.h \
        acl-storage.h
-
-install-exec-local:
-       for d in imap lda; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib01_acl_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib01_acl_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done

diff --git a/src/plugins/autocreate/Makefile.am b/src/plugins/autocreate/Makefile.am
index 13f537045c6ecd76f0a13238d3286c2b2a1dca14..d6bb2b85c9c99931e21725b2dbfbf16cad737ceb 100644 (file)
--- a/src/plugins/autocreate/Makefile.am
+++ b/src/plugins/autocreate/Makefile.am
@@ -14,11 +14,3 @@ lib20_autocreate_plugin_la_SOURCES = \
 
 noinst_HEADERS = \
        autocreate-plugin.h
-
-install-exec-local:
-       for d in imap pop3 lda; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib20_autocreate_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib20_autocreate_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done
-

diff --git a/src/plugins/convert/Makefile.am b/src/plugins/convert/Makefile.am
index a2a2b1828341eaa50fb5d0bb5f3f86309532bbeb..a8296266c09ca60c5fa4f8aaa453f090473adbc7 100644 (file)
--- a/src/plugins/convert/Makefile.am
+++ b/src/plugins/convert/Makefile.am
@@ -41,10 +41,3 @@ convert_tool_LDADD = \
        $(libs)
 
 convert_tool_DEPENDENCIES = $(libs) $(common_objects)
-
-install-exec-local:
-       for d in imap pop3 lda; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib20_convert_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib20_convert_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done

diff --git a/src/plugins/expire/Makefile.am b/src/plugins/expire/Makefile.am
index 3b5dad58d84f71c913bfa556328839466b72c059..4a4e7a0c60c3a14aaf8e7a7bc4634eefe714a5bd 100644 (file)
--- a/src/plugins/expire/Makefile.am
+++ b/src/plugins/expire/Makefile.am
@@ -41,12 +41,3 @@ libs = \
 expire_tool_LDADD = $(libs)
 
 expire_tool_DEPENDENCIES = $(libs)
-
-install-exec-local:
-       $(mkdir_p) $(DESTDIR)$(moduledir)/imap \
-         $(DESTDIR)$(moduledir)/pop3 \
-         $(DESTDIR)$(moduledir)/lda
-       for d in imap pop3 lda; do \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib20_expire_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib20_expire_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done

diff --git a/src/plugins/fts-lucene/Makefile.am b/src/plugins/fts-lucene/Makefile.am
index 399fc2db2d575626e26268ac0bc5f91dff0ad4cc..42ee3c1e18b2bdaabd5add183755fec432ad2b52 100644 (file)
--- a/src/plugins/fts-lucene/Makefile.am
+++ b/src/plugins/fts-lucene/Makefile.am
@@ -22,10 +22,3 @@ lib21_fts_lucene_plugin_la_SOURCES = \
 noinst_HEADERS = \
        fts-lucene-plugin.h \
        lucene-wrapper.h
-
-install-exec-local:
-       for d in imap pop3 lda; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib21_fts_lucene_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib21_fts_lucene_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done

diff --git a/src/plugins/fts-solr/Makefile.am b/src/plugins/fts-solr/Makefile.am
index 9cedc42c0528414c87a0e62ed8c80e4c8587419f..cc3d63190321c6a9c6430762fda6e1d4122da8e6 100644 (file)
--- a/src/plugins/fts-solr/Makefile.am
+++ b/src/plugins/fts-solr/Makefile.am
@@ -22,10 +22,3 @@ lib21_fts_solr_plugin_la_SOURCES = \
 noinst_HEADERS = \
        fts-solr-plugin.h \
        solr-connection.h
-
-install-exec-local:
-       for d in imap pop3 lda; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib21_fts_solr_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib21_fts_solr_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done

diff --git a/src/plugins/fts-squat/Makefile.am b/src/plugins/fts-squat/Makefile.am
index 963de9fac6303f812ae2aa2db6a651fcb2a8a0fa..1054dcb49f3cb472fbaafe6957676c06ca1973d7 100644 (file)
--- a/src/plugins/fts-squat/Makefile.am
+++ b/src/plugins/fts-squat/Makefile.am
@@ -40,10 +40,3 @@ squat_test_LDADD = \
        $(libs)
 
 squat_test_DEPENDENCIES = $(libs) $(common_objects)
-
-install-exec-local:
-       for d in imap pop3 lda; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib21_fts_squat_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib21_fts_squat_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done

diff --git a/src/plugins/fts/Makefile.am b/src/plugins/fts/Makefile.am
index c0859800a5db2f72b4cc137b6d2a80350a869fdd..98c92de00f43bb0573a2fe42e3fa9d2220b1821c 100644 (file)
--- a/src/plugins/fts/Makefile.am
+++ b/src/plugins/fts/Makefile.am
@@ -21,10 +21,3 @@ noinst_HEADERS = \
        fts-api-private.h \
        fts-plugin.h \
        fts-storage.h
-
-install-exec-local:
-       for d in imap pop3 lda; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib20_fts_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib20_fts_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done

diff --git a/src/plugins/imap-acl/Makefile.am b/src/plugins/imap-acl/Makefile.am
index 76859e664b9110328f1da83f6fdb0771208a5ad0..07071d443d7609edd40f19c71b9451e122443505 100644 (file)
--- a/src/plugins/imap-acl/Makefile.am
+++ b/src/plugins/imap-acl/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/imap \
        -I$(top_srcdir)/src/plugins/acl
 
-imap_moduledir = $(moduledir)/imap
+imap_moduledir = $(moduledir)
 
 lib02_imap_acl_plugin_la_LDFLAGS = -module -avoid-version
 

diff --git a/src/plugins/imap-quota/Makefile.am b/src/plugins/imap-quota/Makefile.am
index 15272d12e145955825eda93615f9862d4f8cdeae..c9302bfa75ffb9023d6ef397d14fbf4920d65cf6 100644 (file)
--- a/src/plugins/imap-quota/Makefile.am
+++ b/src/plugins/imap-quota/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/imap \
        -I$(top_srcdir)/src/plugins/quota
 
-imap_moduledir = $(moduledir)/imap
+imap_moduledir = $(moduledir)
 
 lib11_imap_quota_plugin_la_LDFLAGS = -module -avoid-version
 

diff --git a/src/plugins/lazy-expunge/Makefile.am b/src/plugins/lazy-expunge/Makefile.am
index 695af464ebefce0b5582125b8112a7ce63f2ca3e..83f8437d6f9b617010e910b2b25b72d7c9c8fe18 100644 (file)
--- a/src/plugins/lazy-expunge/Makefile.am
+++ b/src/plugins/lazy-expunge/Makefile.am
@@ -18,11 +18,3 @@ lib02_lazy_expunge_plugin_la_SOURCES = \
 
 noinst_HEADERS = \
        lazy-expunge-plugin.h
-
-install-exec-local:
-       for d in imap pop3; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib02_lazy_expunge_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib02_lazy_expunge_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done
-

diff --git a/src/plugins/listescape/Makefile.am b/src/plugins/listescape/Makefile.am
index bcd28e28347e0b168423b0096967b8e5615f0dad..8d6c03df79368a9b8d13925e705db54865e392e6 100644 (file)
--- a/src/plugins/listescape/Makefile.am
+++ b/src/plugins/listescape/Makefile.am
@@ -15,11 +15,3 @@ lib20_listescape_plugin_la_SOURCES = \
 
 noinst_HEADERS = \
        listescape-plugin.h
-
-install-exec-local:
-       for d in imap pop3 lda; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib20_listescape_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib20_listescape_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done
-

diff --git a/src/plugins/mail-log/Makefile.am b/src/plugins/mail-log/Makefile.am
index f4a46b03ba9853c28b1ce91069f4e4335df50e26..2a586b5e21447cedf270feee5c8578cf8cfb19d8 100644 (file)
--- a/src/plugins/mail-log/Makefile.am
+++ b/src/plugins/mail-log/Makefile.am
@@ -17,11 +17,3 @@ lib20_mail_log_plugin_la_SOURCES = \
 
 noinst_HEADERS = \
        mail-log-plugin.h
-
-install-exec-local:
-       for d in imap pop3 lda; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib20_mail_log_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib20_mail_log_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done
-

diff --git a/src/plugins/mbox-snarf/Makefile.am b/src/plugins/mbox-snarf/Makefile.am
index 001b728aae9f42a20fe03d2e06a27b88aca6b0ad..5d2ba8f0274a082cd3773cf420cca42285a906c6 100644 (file)
--- a/src/plugins/mbox-snarf/Makefile.am
+++ b/src/plugins/mbox-snarf/Makefile.am
@@ -14,10 +14,3 @@ lib20_mbox_snarf_plugin_la_SOURCES = \
 
 noinst_HEADERS = \
        mbox-snarf-plugin.h
-
-install-exec-local:
-       for d in imap pop3; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib20_mbox_snarf_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib20_mbox_snarf_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done

diff --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am
index acd0df0d8becd712f5395323a331256c7baecdd0..4c8c6d94a06e439a5530af4705e794e6e129e036 100644 (file)
--- a/src/plugins/quota/Makefile.am
+++ b/src/plugins/quota/Makefile.am
@@ -57,13 +57,6 @@ noinst_HEADERS = \
        quota-plugin.h \
        quota-private.h
 
-install-exec-local:
-       for d in imap pop3 lda; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib10_quota_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib10_quota_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done
-
 EXTRA_DIST = rquota.x
 
 DISTFILES = $(DIST_COMMON) $(quota_dist_sources) $(TEXINFOS) $(EXTRA_DIST)

diff --git a/src/plugins/trash/Makefile.am b/src/plugins/trash/Makefile.am
index 21d0257a8f9f6dba0ab1e825685da6c861fa15e0..8b18ab71ef391ac9eb5b960c3bf5f701665f55c2 100644 (file)
--- a/src/plugins/trash/Makefile.am
+++ b/src/plugins/trash/Makefile.am
@@ -15,11 +15,3 @@ lib11_trash_plugin_la_SOURCES = \
 
 noinst_HEADERS = \
        trash-plugin.h
-
-install-exec-local:
-       for d in imap lda; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib11_trash_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib11_trash_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done
-

diff --git a/src/plugins/virtual/Makefile.am b/src/plugins/virtual/Makefile.am
index 94d58b3b219f4ce319523e82f1e0190e82e9977b..a5d905e7c915ce038502670e5113fa9b9a06a97c 100644 (file)
--- a/src/plugins/virtual/Makefile.am
+++ b/src/plugins/virtual/Makefile.am
@@ -25,10 +25,3 @@ noinst_HEADERS = \
        virtual-plugin.h \
        virtual-storage.h \
        virtual-transaction.h
-
-install-exec-local:
-       for d in imap pop3 lda; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib20_virtual_plugin.so; \
-         $(LN_S) ../lib20_virtual_plugin.so $(DESTDIR)$(moduledir)/$$d; \
-       done

diff --git a/src/plugins/zlib/Makefile.am b/src/plugins/zlib/Makefile.am
index 3bb13afe4d2fc4687f58bbf01cc5410931f91ddc..2e5f4c19eda62dd668be59bf011ecf92a972d6ac 100644 (file)
--- a/src/plugins/zlib/Makefile.am
+++ b/src/plugins/zlib/Makefile.am
@@ -28,10 +28,3 @@ lib20_zlib_plugin_la_SOURCES = \
 noinst_HEADERS = \
        istream-zlib.h \
        zlib-plugin.h
-
-install-exec-local:
-       for d in imap pop3; do \
-         $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
-         rm -f $(DESTDIR)$(moduledir)/$$d/lib20_zlib_plugin$(MODULE_SUFFIX); \
-         $(LN_S) ../lib20_zlib_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
-       done

diff --git a/src/pop3/pop3-settings.c b/src/pop3/pop3-settings.c
index 06a31dc01deb4689694a4d12a16ae484646d137d..c5ac88bd57bc59299ec63592c8ef1f6b2dc09bcb 100644 (file)
--- a/src/pop3/pop3-settings.c
+++ b/src/pop3/pop3-settings.c
@@ -49,7 +49,7 @@ static struct pop3_settings pop3_default_settings = {
        MEMBER(verbose_proctitle) FALSE,
 
        MEMBER(mail_plugins) "",
-       MEMBER(mail_plugin_dir) MODULEDIR"/pop3",
+       MEMBER(mail_plugin_dir) MODULEDIR,
 
        MEMBER(pop3_no_flag_updates) FALSE,
        MEMBER(pop3_enable_last) FALSE,