aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in3
-rw-r--r--my-evolution/ChangeLog5
-rw-r--r--my-evolution/Makefile.am2
4 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ffda2d480..71dd3035b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-04 Ettore Perazzoli <ettore@ximian.com>
+
+ * configure.in: Define COMPONENT_DIR.
+
2002-11-22 Jeffrey Stedfast <fejj@ximian.com>
* configure.in: Add NSPR CFLAGS and LDFLAGS to the E_UTIL build
diff --git a/configure.in b/configure.in
index 113c797115..20c6903831 100644
--- a/configure.in
+++ b/configure.in
@@ -1024,6 +1024,9 @@ AC_SUBST(IDL_INCLUDES)
AM_PATH_GLIB_2_0
+COMPONENT_DIR=$prefix/lib/evolution/components
+AC_SUBST(COMPONENT_DIR)
+
dnl Utility macro to set compiler flags for a specific lib.
AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
deps="$2"
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 9f678f71ed..0dc8059a9a 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,5 +1,10 @@
2002-12-04 Ettore Perazzoli <ettore@ximian.com>
+ * Makefile.am (componentdir): Install in $(COMPONENT_DIR), not in
+ ${prefix}/evolution/components.
+
+2002-12-04 Ettore Perazzoli <ettore@ximian.com>
+
* GNOME_Evolution_Summary.server.in.in: Updated to be a shared
library.
diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am
index 049deefebc..6eabb5ff0a 100644
--- a/my-evolution/Makefile.am
+++ b/my-evolution/Makefile.am
@@ -74,7 +74,7 @@ summary_libs = \
$(top_builddir)/libwombat/libwombat.la \
$(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)
-componentdir = $(prefix)/evolution/components
+componentdir = $(COMPONENT_DIR)
component_LTLIBRARIES = libevolution-executive-summary.la
libevolution_executive_summary_la_SOURCES = $(summary_sources)
libevolution_executive_summary_la_LIBADD = $(summary_libs)