Define in terms of privincludedir. (camellibexecdir): Define in terms of

	* Makefile.am (libcamelincludedir): Define in terms of
	privincludedir.
	(camellibexecdir): Define in terms of privlibexecdir
	(libcamel_la_LDFLAGS): Remove -rpath. (automake will add that)

	* providers/imap/Makefile.am (libcamelimapincludedir): Define in
	terms of privincludedir.
	(INCLUDES): Remove -I$(includedir)
	* providers/local/Makefile.am: Likewise
	* providers/nntp/Makefile.am: Likewise
	* providers/pop3/Makefile.am: Likewise
	* providers/sendmail/Makefile.am: Likewise
	* providers/smtp/Makefile.am: Likewise

svn path=/trunk/; revision=19775

8 files changed, 25 insertions, 15 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index a34209a241..0051ebffb4 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,19 @@
+2003-02-05  Dan Winship  <danw@ximian.com>
+
+	* Makefile.am (libcamelincludedir): Define in terms of
+	privincludedir.
+	(camellibexecdir): Define in terms of privlibexecdir
+	(libcamel_la_LDFLAGS): Remove -rpath. (automake will add that)
+
+	* providers/imap/Makefile.am (libcamelimapincludedir): Define in
+	terms of privincludedir.
+	(INCLUDES): Remove -I$(includedir)
+	* providers/local/Makefile.am: Likewise
+	* providers/nntp/Makefile.am: Likewise
+	* providers/pop3/Makefile.am: Likewise
+	* providers/sendmail/Makefile.am: Likewise
+	* providers/smtp/Makefile.am: Likewise
+
 2003-02-04  Not Zed  <NotZed@Ximian.com>
 
 	* camel-object.c (camel_object_bag_new): Init bag->owner to 0.
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 97f445024c..119798b233 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -2,9 +2,9 @@
 
 SUBDIRS = . providers tests
 
-libcamelincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
+libcamelincludedir = $(privincludedir)/camel
 
-camellibexecdir = $(libexecdir)/evolution/$(BASE_VERSION)/camel/
+camellibexecdir = $(privlibexecdir)/camel
 camellibexec_PROGRAMS =	camel-lock-helper camel-index-control
 
 privlib_LTLIBRARIES = libcamel.la
@@ -221,7 +221,7 @@ libcamelinclude_HEADERS =			\
 	camel.h					\
 	string-utils.h
 
-libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libcamel_la_LDFLAGS = -version-info 0:0:0
 
 libcamel_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la 	\
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index d6ca625822..78ca84dacd 100644
--- a/camel/providers/imap/Makefile.am
+++ b/camel/providers/imap/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamelimapincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
+libcamelimapincludedir = $(privincludedir)/camel
 
 camel_provider_LTLIBRARIES = libcamelimap.la
 camel_provider_DATA = libcamelimap.urls
@@ -11,7 +11,6 @@ INCLUDES = -I.. \
 	-I$(top_srcdir)/intl			\
 	-I$(top_srcdir)/e-util			\
 	-I$(top_srcdir)				\
-	-I$(includedir)				\
 	$(CAMEL_CFLAGS)				\
 	$(GNOME_INCLUDEDIR)			\
 	$(GTK_INCLUDEDIR)			\
diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am
index ee2d4dfe8c..203e7262d1 100644
--- a/camel/providers/local/Makefile.am
+++ b/camel/providers/local/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamellocalincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
+libcamellocalincludedir = $(privincludedir)/camel
 
 camel_provider_LTLIBRARIES = libcamellocal.la
 camel_provider_DATA = libcamellocal.urls
@@ -11,7 +11,6 @@ INCLUDES = -I.. \
 	-I$(top_srcdir)/intl			\
 	-I$(top_srcdir)/e-util			\
 	-I$(top_srcdir)				\
-	-I$(includedir)				\
 	$(CAMEL_CFLAGS)				\
 	$(GNOME_INCLUDEDIR)			\
 	$(GTK_INCLUDEDIR)			\
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
index 505cfb0ab4..77a10c8e9e 100644
--- a/camel/providers/nntp/Makefile.am
+++ b/camel/providers/nntp/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamelnntpincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
+libcamelnntpincludedir = $(privincludedir)/camel
 
 camel_provider_LTLIBRARIES = libcamelnntp.la
 camel_provider_DATA = libcamelnntp.urls
@@ -10,7 +10,6 @@ INCLUDES = -I../..				\
 	-I$(top_srcdir)/intl			\
 	-I$(top_srcdir)/e-util			\
 	-I$(top_srcdir)				\
-	-I$(includedir)				\
 	$(CAMEL_CFLAGS)				\
 	$(GNOME_INCLUDEDIR)			\
 	$(GTK_INCLUDEDIR)			\
diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
index cf7369b6b5..b5e210df28 100644
--- a/camel/providers/pop3/Makefile.am
+++ b/camel/providers/pop3/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamelpop3includedir = $(includedir)/evolution-$(BASE_VERSION)/camel
+libcamelpop3includedir = $(privincludedir)/camel
 
 camel_provider_LTLIBRARIES = libcamelpop3.la
 camel_provider_DATA = libcamelpop3.urls
@@ -9,7 +9,6 @@ INCLUDES =					\
 	-I..					\
 	-I$(srcdir)/..				\
 	-I$(srcdir)/../../..			\
-        -I$(includedir)				\
 	-I$(top_srcdir)/intl			\
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)/e-util			\
diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
index 59c6bdb927..71c0a191fe 100644
--- a/camel/providers/sendmail/Makefile.am
+++ b/camel/providers/sendmail/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamelsendmailincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
+libcamelsendmailincludedir = $(privincludedir)/camel
 
 camel_provider_LTLIBRARIES = libcamelsendmail.la
 camel_provider_DATA = libcamelsendmail.urls
@@ -9,7 +9,6 @@ INCLUDES =						\
 	-I..						\
 	-I$(srcdir)/..					\
 	-I$(srcdir)/../../..				\
-	-I$(includedir)					\
 	-I$(top_srcdir)/intl				\
 	-I$(top_srcdir)/camel                   	\
 	$(CAMEL_CFLAGS)					\
diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
index b296dd0dee..df26fc0c40 100644
--- a/camel/providers/smtp/Makefile.am
+++ b/camel/providers/smtp/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamelsmtpincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
+libcamelsmtpincludedir = $(privincludedir)/camel
 
 camel_provider_LTLIBRARIES = libcamelsmtp.la
 camel_provider_DATA = libcamelsmtp.urls
@@ -9,7 +9,6 @@ INCLUDES =					\
 	-I..					\
 	-I$(srcdir)/..				\
 	-I$(srcdir)/../../..			\
-	-I$(includedir)				\
 	-I$(top_srcdir)/intl			\
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)/e-util			\