aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libical/ChangeLog6
-rw-r--r--libical/configure.in9
-rw-r--r--libical/src/libical/Makefile.am4
3 files changed, 17 insertions, 2 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog
index 97d25838f0..dcce7e3d03 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-12 Hans Petter Jansson <hpj@ximian.com>
+
+ * configure.in: Subst in Evolution install variables.
+
+ * src/libical/Makefile.am (CPPFLAGS): Use Evolution's privdatadir.
+
2002-07-09 Andrea Campi <a.campi@inet.it>
* src/libical/icalcomponent.c
diff --git a/libical/configure.in b/libical/configure.in
index c148ca0d6c..46d889ddf2 100644
--- a/libical/configure.in
+++ b/libical/configure.in
@@ -5,6 +5,15 @@ AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(libical,0.24)
AM_CONFIG_HEADER(config.h)
+dnl Set the aux dir to .. (the toplevel evolution directory) so ylwrap
+dnl is found in the correct directory for automake >= 1.5
+AC_CONFIG_AUX_DIR(..)
+
+dnl Subst in evolution's private directories
+AC_SUBST(privlibdir)
+AC_SUBST(privincludedir)
+AC_SUBST(privdatadir)
+
dnl Initialize maintainer mode
AM_MAINTAINER_MODE
diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am
index 2249db8602..e96d26a778 100644
--- a/libical/src/libical/Makefile.am
+++ b/libical/src/libical/Makefile.am
@@ -2,7 +2,7 @@
# FILE: Makefile.am
# CREATOR: eric
#
-# $Id: Makefile.am,v 1.36 2003/09/11 22:04:19 hansp Exp $
+# $Id: Makefile.am,v 1.37 2003/09/12 18:14:01 hansp Exp $
#
#
# (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -40,7 +40,7 @@ noinst_LTLIBRARIES = libical-static.la
libical_static_la_SOURCES = $(libical_la_SOURCES)
libical_static_la_LDFLAGS = --all-static
-CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
+CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(privdatadir)"\"
# CFLAGS = -g