Flattened header namespace on install.

--HG--
branch : HEAD

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 94f7245605607a6588c221d380206510e8cdbcb3..dc7df52470c88cf273ac50734fb671ff615682a3 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -150,7 +150,7 @@ libauthdb_ldap_la_SOURCES = $(ldap_sources)
 endif
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/auth
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/imap/Makefile.am b/src/imap/Makefile.am
index 5f4d9d9a0bdb17a0e367cfff307dfe269be2c94f..2cb23031987ab93387887f7510239c6bf12b9a89 100644 (file)
--- a/src/imap/Makefile.am
+++ b/src/imap/Makefile.am
@@ -91,7 +91,7 @@ headers = \
        imap-sync.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/imap
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-auth/Makefile.am b/src/lib-auth/Makefile.am
index 182da1f0ef39817b6fd80e3f580e6215ee5eca08..ca0ff56eca4eb5685c90913391b8a7cb3c35cc37 100644 (file)
--- a/src/lib-auth/Makefile.am
+++ b/src/lib-auth/Makefile.am
@@ -17,7 +17,7 @@ headers = \
        auth-server-request.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-auth
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-charset/Makefile.am b/src/lib-charset/Makefile.am
index b929b7230816c905e822294a3ff50c8c6709f829..b60b86c77cb2e61ca611b17e1424d9ecb308ba04 100644 (file)
--- a/src/lib-charset/Makefile.am
+++ b/src/lib-charset/Makefile.am
@@ -11,7 +11,7 @@ headers = \
        charset-utf8.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-charset
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-dict/Makefile.am b/src/lib-dict/Makefile.am
index 3200fd9b79d5b1525a82e5826de052acde704734..83d1d9a1874f89f96093399370802a0d95f79fee 100644 (file)
--- a/src/lib-dict/Makefile.am
+++ b/src/lib-dict/Makefile.am
@@ -35,7 +35,7 @@ headers = \
        dict-sql-settings.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-dict
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-imap/Makefile.am b/src/lib-imap/Makefile.am
index c52d985c2bccd3c4dc92cfccb9d6c562c333933c..4920bc9625923c38708d6d1f58d0abb25c4cded2 100644 (file)
--- a/src/lib-imap/Makefile.am
+++ b/src/lib-imap/Makefile.am
@@ -33,7 +33,7 @@ headers = \
        imap-util.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-imap
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-index/Makefile.am b/src/lib-index/Makefile.am
index 2b63fbc79ec25a9cac9517c99ffd765aeb841494..d0119f96b166b0939a905c6565cd7a50a2995289 100644 (file)
--- a/src/lib-index/Makefile.am
+++ b/src/lib-index/Makefile.am
@@ -51,7 +51,7 @@ headers = \
         mailbox-list-index-private.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-index
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-lda/Makefile.am b/src/lib-lda/Makefile.am
index d7e967c949448ab1998f9234fac94f7bb926f3b4..f4b7811f877ad9c797541d0472f0b6ebe2b94827 100644 (file)
--- a/src/lib-lda/Makefile.am
+++ b/src/lib-lda/Makefile.am
@@ -22,7 +22,7 @@ headers = \
        smtp-client.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-lda
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-mail/Makefile.am b/src/lib-mail/Makefile.am
index a6209060c3e9552297fd40ffcb1775aef19afc7f..96558dfad0395f34d608d8a30ba0ba802ba598e1 100644 (file)
--- a/src/lib-mail/Makefile.am
+++ b/src/lib-mail/Makefile.am
@@ -42,7 +42,7 @@ headers = \
        rfc822-parser.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-mail
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-settings/Makefile.am b/src/lib-settings/Makefile.am
index da742f2b1bf2c0f102793809e96a6cf83d797bea..24058174b5fda372dc40ca1adc547c2d68bfa887 100644 (file)
--- a/src/lib-settings/Makefile.am
+++ b/src/lib-settings/Makefile.am
@@ -12,7 +12,7 @@ headers = \
        settings-parser.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-settings
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-sql/Makefile.am b/src/lib-sql/Makefile.am
index 79946c7560609a1eba8ca9e97431e439ff625684..ea79f45d578ca78a872473276cffde4c7a8469af 100644 (file)
--- a/src/lib-sql/Makefile.am
+++ b/src/lib-sql/Makefile.am
@@ -69,7 +69,7 @@ headers = \
        sql-pool.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-sql
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am
index 090a22736cd2072758edd4fd83ec016d012c9856..2134eba7f29320a1e9d524a83ce825d60d283602 100644 (file)
--- a/src/lib-storage/Makefile.am
+++ b/src/lib-storage/Makefile.am
@@ -65,7 +65,7 @@ libdovecot_storage_la_DEPENDENCIES = $(shlibs)
 libdovecot_storage_la_LDFLAGS = -export-dynamic
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-storage
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-storage/index/Makefile.am b/src/lib-storage/index/Makefile.am
index d3903aa417f0cb2e53b202530797aff5760eff03..2b97f86dc5678a12cbbd267b1dafb1f422d8d260 100644 (file)
--- a/src/lib-storage/index/Makefile.am
+++ b/src/lib-storage/index/Makefile.am
@@ -44,7 +44,7 @@ headers = \
        index-thread-private.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-storage/index
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-storage/index/cydir/Makefile.am b/src/lib-storage/index/cydir/Makefile.am
index b265076bdb652d79e930790b0da5d9c6f9891a4b..116230f82b4a65df3cc0caf7608f16aacd95b02c 100644 (file)
--- a/src/lib-storage/index/cydir/Makefile.am
+++ b/src/lib-storage/index/cydir/Makefile.am
@@ -20,7 +20,7 @@ headers = \
        cydir-sync.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-storage/index/cydir
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-storage/index/dbox/Makefile.am b/src/lib-storage/index/dbox/Makefile.am
index a0d417dc02f11151fba830551952e80f670149e1..83a4ea14c8a0136e06fce5842ba2f301fde5073a 100644 (file)
--- a/src/lib-storage/index/dbox/Makefile.am
+++ b/src/lib-storage/index/dbox/Makefile.am
@@ -35,7 +35,7 @@ headers = \
        dbox-sync.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-storage/index/dbox
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-storage/index/maildir/Makefile.am b/src/lib-storage/index/maildir/Makefile.am
index 767016808e5f7a1a4222281445deb78b10dc2c93..b6451cf885a68581ed5d12c7d5ed2b1d739d1ddc 100644 (file)
--- a/src/lib-storage/index/maildir/Makefile.am
+++ b/src/lib-storage/index/maildir/Makefile.am
@@ -32,7 +32,7 @@ headers = \
        maildir-uidlist.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-storage/index/maildir
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-storage/index/mbox/Makefile.am b/src/lib-storage/index/mbox/Makefile.am
index ebc92efcb85b7281cc35ed4347f7e11eca0fa940..f9e9a6e42a1e20ee83dc686e68e5b293de5b85ff 100644 (file)
--- a/src/lib-storage/index/mbox/Makefile.am
+++ b/src/lib-storage/index/mbox/Makefile.am
@@ -34,7 +34,7 @@ headers = \
        mbox-sync-private.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-storage/index/mbox
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-storage/index/raw/Makefile.am b/src/lib-storage/index/raw/Makefile.am
index 907590d0dc15d37e1a72bbcb8448149166a2809d..38ff536f8c40e1f35a265e989ebd4f29a524dede 100644 (file)
--- a/src/lib-storage/index/raw/Makefile.am
+++ b/src/lib-storage/index/raw/Makefile.am
@@ -19,7 +19,7 @@ headers = \
        raw-sync.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-storage/index/raw
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-storage/index/shared/Makefile.am b/src/lib-storage/index/shared/Makefile.am
index 042470a8da761a19a6339649b67371d694d4aac4..df5c2aedcc140226f7a7e12f1b8f3a5a6dada4b3 100644 (file)
--- a/src/lib-storage/index/shared/Makefile.am
+++ b/src/lib-storage/index/shared/Makefile.am
@@ -17,7 +17,7 @@ headers = \
        shared-storage.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-storage/index/shared
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib-storage/list/Makefile.am b/src/lib-storage/list/Makefile.am
index 3b07e463d58d00a020a090a7da5507134e049cb3..eebefc312265e79436af930a2ecd53972a595d71 100644 (file)
--- a/src/lib-storage/list/Makefile.am
+++ b/src/lib-storage/list/Makefile.am
@@ -26,7 +26,7 @@ headers = \
        subscription-file.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib-storage/list
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 13c86655dbf39465f39b4ef823afb2e1cc79cc0d..f8cf132ca5248bc467b5b0df50389ee6e9dea060 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -199,7 +199,7 @@ headers = \
        write-full.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/lib
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)

diff --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am
index edd195c79420ca7fb10e6d39c8a93277928d370f..20e578792103566ff636445f9bd1ffe399e2c6f9 100644 (file)
--- a/src/pop3/Makefile.am
+++ b/src/pop3/Makefile.am
@@ -40,7 +40,7 @@ headers = \
        pop3-settings.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/src/pop3
+  pkginc_libdir=$(pkgincludedir)
   pkginc_lib_HEADERS = $(headers)
 else
   noinst_HEADERS = $(headers)