From 5a2fc93d303f227d3f6fe80f4561b6fc37fd220f Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 22 Jan 2003 20:08:56 +0000 Subject: 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. svn path=/trunk/; revision=19554 --- camel/providers/imap/Makefile.am | 2 +- camel/providers/local/Makefile.am | 2 +- camel/providers/nntp/Makefile.am | 2 +- camel/providers/pop3/Makefile.am | 2 +- camel/providers/sendmail/Makefile.am | 2 +- camel/providers/smtp/Makefile.am | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'camel/providers') diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am index b2f6014349..d6ca625822 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 f01cb7ba4f..ee2d4dfe8c 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 b5deeca2cd..505cfb0ab4 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 34fa38183c..cf7369b6b5 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 35632d318b..59c6bdb927 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 c6fc2b590e..b296dd0dee 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 -- cgit