diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/Makefile.am | 2 | ||||
| -rw-r--r-- | mail/importers/Makefile.am | 2 |
5 files changed, 25 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2002-07-10 Peter Williams <peterw@ximian.com> + + * configure.in (privlibdir): Define a versioned library directory that we can + use for things that are ABI-sensitive: camel providers, importers... Define + camel_providerder in terms of this, resulting in a new location for the + providers. Camel will have to be rebuilt for it to get the new + -D flag. + 2002-07-12 Peter Williams <peterw@ximian.com> * configure.in (E_UTIL_LIBS): e-util relies on bonobo-conf diff --git a/configure.in b/configure.in index 93a9b6fc31..81cd2773e0 100644 --- a/configure.in +++ b/configure.in @@ -1134,7 +1134,14 @@ AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_LIBS) dnl --- evolution-mail flags -camel_providerdir='$(libdir)/evolution/camel-providers/'$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION +dnl ****************************** +dnl Versioned library files +dnl ****************************** + +privlibdir='$(pkglibdir)/'$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION +AC_SUBST(privlibdir) + +camel_providerdir="$privlibdir/camel-providers" AC_SUBST(camel_providerdir) EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, $FULL_GNOME_DEPS, $GCONF_CFLAGS $THREADS_CFLAGS, $GCONF_LIBS $THREADS_LIBS) diff --git a/mail/ChangeLog b/mail/ChangeLog index 5947602c30..ba2c0d3d56 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2002-07-10 Peter Williams <peterw@ximian.com> + + * Makefile.am (importerdir): Define this in terms of the new + privlibdir, again resulting in a new directory name. + + * importers/Makefile.am (importersdir): Here too. + 2002-07-15 Not Zed <NotZed@Ximian.com> * mail-vfolder.c (vfolder_editor_clicked): Set the vfolder_editor diff --git a/mail/Makefile.am b/mail/Makefile.am index fa16a075f3..37a9c77395 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = importers bin_PROGRAMS = evolution-mail -importerdir = $(libdir)/evolution/evolution-mail-importers/$(VERSION) +importerdir = $(privlibdir)/evolution-mail-importers INCLUDES = \ -I$(top_srcdir)/widgets \ diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index f8a97d66dd..915f665d93 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -1,4 +1,4 @@ -importersdir = $(pkglibdir)/evolution-mail-importers/$(VERSION) +importersdir = $(privlibdir)/evolution-mail-importers importers_LTLIBRARIES = liboutlook.la libmbox.la |