Update to the new $(BASE_VERSION)-versioned path. Likewise. Likewise.

* providers/imap/Makefile.am (libcamelimapincludedir): Update to
the new $(BASE_VERSION)-versioned path.
* providers/smtp/Makefile.am (libcamelsmtpincludedir): Likewise.
* providers/sendmail/Makefile.am (libcamelsendmailincludedir):
Likewise.
* providers/pop3/Makefile.am (libcamelpop3includedir): Likewise.
* providers/nntp/Makefile.am (libcamelnntpincludedir): Likewise.
* providers/local/Makefile.am (libcamellocalincludedir): Likewise.

* camel-lock-client.c (camel_lock_helper_init): Use
CAMEL_LIBEXECDIR instead of CAMEL_SBINDIR to find
camel-lock-helper.

* Makefile.am: Install camel-lock-helper and camel-index-control
in $(libexec)/evolution/$(BASE_VERSION)/camel.  Install
libcamel.la in $privlibdir.
(install-exec-hook): Update for the new location of
camel-lock-helper.
(libcamelincludedir): Version using $(BASE_VERSION).
(INCLUDES): Define CAMEL_LIBEXECDIR.

9 files changed, 41 insertions, 17 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 35c386387..a43b31da9 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,26 @@
+2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
+
+	* providers/imap/Makefile.am (libcamelimapincludedir): Update to
+	the new $(BASE_VERSION)-versioned path.
+	* providers/smtp/Makefile.am (libcamelsmtpincludedir): Likewise.
+	* providers/sendmail/Makefile.am (libcamelsendmailincludedir):
+	Likewise.
+	* providers/pop3/Makefile.am (libcamelpop3includedir): Likewise.
+	* providers/nntp/Makefile.am (libcamelnntpincludedir): Likewise.
+	* providers/local/Makefile.am (libcamellocalincludedir): Likewise.
+
+	* camel-lock-client.c (camel_lock_helper_init): Use
+	CAMEL_LIBEXECDIR instead of CAMEL_SBINDIR to find
+	camel-lock-helper.
+
+	* Makefile.am: Install camel-lock-helper and camel-index-control
+	in $(libexec)/evolution/$(BASE_VERSION)/camel.  Install
+	libcamel.la in $privlibdir.
+	(install-exec-hook): Update for the new location of
+	camel-lock-helper.
+	(libcamelincludedir): Version using $(BASE_VERSION).
+	(INCLUDES): Define CAMEL_LIBEXECDIR.
+
 2003-01-21  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* camel-mime-filter-canon.c (complete): Set the backbuflen to 0 so
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 0e76d2a1b..9dc4a2f72 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -2,17 +2,18 @@
 
 SUBDIRS = . providers tests
 
-libcamelincludedir = $(includedir)/camel
+libcamelincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
 
-sbin_PROGRAMS =	camel-lock-helper camel-index-control
+camellibexecdir = $(libexec)/evolution/$(BASE_VERSION)/camel/
+camellibexec_PROGRAMS =	camel-lock-helper camel-index-control
 
-lib_LTLIBRARIES = libcamel.la
+privlib_LTLIBRARIES = libcamel.la
 noinst_LTLIBRARIES = libcamel-static.la
 
 INCLUDES = -I.. -I$(srcdir)/.. 			 	\
 	-I$(top_srcdir)/intl			 	\
 	-I$(top_srcdir)/e-util			 	\
-	-DCAMEL_SBINDIR=\""$(sbindir)"\"	 	\
+	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\"	\
 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
 	-DG_LOG_DOMAIN=\"camel\"			\
 	-DG_DISABLE_DEPRECATED				\
@@ -252,8 +253,8 @@ camel_index_control_LDADD =			\
 install-exec-hook:
 	@if test -n "$(CAMEL_LOCK_HELPER_USER)"; then \
 	    if test `whoami` = root ; then \
-	 	chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper ; \
-		chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \
+	 	chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(camellibexecdir)/camel-lock-helper ; \
+		chmod u+s $(DESTDIR)$(camellibexecdir)/camel-lock-helper ; \
 	    else \
 	    	echo '*** WARNING ***' ; \
 		    echo "Camel will not be able to open mbox files until you perform the following steps:" ; \
@@ -267,14 +268,14 @@ install-exec-hook:
 	fi
 	@if test -n "$(CAMEL_LOCK_HELPER_GROUP)"; then \
 	    if test `whoami` = root ; then \
-	    	chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper ; \
-		    chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \
+	    	chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(camellibexecdir)/camel-lock-helper ; \
+		    chmod g+s $(DESTDIR)$(camellibexecdir)/camel-lock-helper ; \
 	    else \
 	    	echo '*** WARNING ***' ; \
 		    echo "Camel will not be able to open mbox files until you perform the following steps:" ; \
 		    echo "    1. Become root" ; \
-		    echo "    2. chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
-		    echo "    3. chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
+		    echo "    2. chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(camellibexecdir)/camel-lock-helper" ; \
+		    echo "    3. chmod g+s $(DESTDIR)$(camellibexecdir)/camel-lock-helper" ; \
 		    echo '*** WARNING ***' ; \
 	    fi \
 	else \
diff --git a/camel/camel-lock-client.c b/camel/camel-lock-client.c
index 99c8fd832..dafdf4643 100644
--- a/camel/camel-lock-client.c
+++ b/camel/camel-lock-client.c
@@ -135,7 +135,7 @@ static int camel_lock_helper_init(CamelException *ex)
 		close(lock_stdout_pipe[1]);
 		for (i=3;i<255;i++)
 			     close(i);
-		execl(CAMEL_SBINDIR "/camel-lock-helper", "camel-lock-helper", NULL);
+		execl(CAMEL_LIBEXECDIR "/camel-lock-helper", "camel-lock-helper", NULL);
 		d(fprintf(stderr, "shit, couldn't exec lock helper!\n"));
 		/* it'll pick this up when it tries to use us */
 		exit(255);
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index b2f601434..d6ca62582 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)/camel
+libcamelimapincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
 
 camel_provider_LTLIBRARIES = libcamelimap.la
 camel_provider_DATA = libcamelimap.urls
diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am
index f01cb7ba4..ee2d4dfe8 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)/camel
+libcamellocalincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
 
 camel_provider_LTLIBRARIES = libcamellocal.la
 camel_provider_DATA = libcamellocal.urls
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
index b5deeca2c..505cfb0ab 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)/camel
+libcamelnntpincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
 
 camel_provider_LTLIBRARIES = libcamelnntp.la
 camel_provider_DATA = libcamelnntp.urls
diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
index 34fa38183..cf7369b6b 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)/camel
+libcamelpop3includedir = $(includedir)/evolution-$(BASE_VERSION)/camel
 
 camel_provider_LTLIBRARIES = libcamelpop3.la
 camel_provider_DATA = libcamelpop3.urls
diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
index 35632d318..59c6bdb92 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)/camel
+libcamelsendmailincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
 
 camel_provider_LTLIBRARIES = libcamelsendmail.la
 camel_provider_DATA = libcamelsendmail.urls
diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
index c6fc2b590..b296dd0de 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)/camel
+libcamelsmtpincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel
 
 camel_provider_LTLIBRARIES = libcamelsmtp.la
 camel_provider_DATA = libcamelsmtp.urls