From 62e341e4c53d9d28e9ec5ffadfa56a1f1947ae15 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Wed, 22 Jan 2003 20:13:09 +0000
Subject: Get my-evolution.xml from EVOLUTION_UI_DIRECTORY.

* e-summary-factory.c (control_activate): Get my-evolution.xml
from EVOLUTION_UI_DIRECTORY.

* e-summary.c (e_pixmap_file): Use EVOLUTION_IMAGEDIR.
(e_pixmap_file): Use EVOLUTION_BUTTONSDIR.

* e-summary-weather.c (e_summary_weather_init_locations): Use
LOCATIONDIR.
(e_summary_weather_fill_etable): Likewise.

* Makefile.am (Locationdir): Version using $(BASE_VERSION).
(gladedir): Likewise.
(INCLUDES): Define EVOLUTION_IMAGEDIR.

svn path=/trunk/; revision=19563
---
 my-evolution/Makefile.am | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'my-evolution/Makefile.am')

diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am
index 9d05e2503d..b33d0adc94 100644
--- a/my-evolution/Makefile.am
+++ b/my-evolution/Makefile.am
@@ -1,19 +1,23 @@
-INCLUDES = \
-	-I$(top_srcdir)						\
-	-I$(top_srcdir)/shell					\
-	-I$(top_builddir)/shell					\
-	-I$(top_srcdir)/calendar				\
-	-I$(top_builddir)/calendar/cal-client			\
-	-I$(top_srcdir)/libical/src/libical			\
-	-I$(top_builddir)/libical/src/libical			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	\
-	-DPREFIX=\"$(prefix)\"					\
-	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
-	-DDATADIR=\""$(datadir)"\"	 			\
-	-DLIBDIR=\""$(datadir)"\"	 			\
-	-DG_LOG_DOMAIN=\"evolution-executive-summary\"		\
+INCLUDES =											\
+	-I$(top_srcdir)										\
+	-I$(top_srcdir)/shell									\
+	-I$(top_builddir)/shell									\
+	-I$(top_srcdir)/calendar								\
+	-I$(top_builddir)/calendar/cal-client							\
+	-I$(top_srcdir)/libical/src/libical							\
+	-I$(top_builddir)/libical/src/libical							\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"							\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"						\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"							\
+	-DEVOLUTION_IMAGEDIR=\""$(datadir)/evolution-$(BASE_VERSION)/images"\"			\
+	-DEVOLUTION_BUTTONSDIR=\""$(datadir)/evolution-$(BASE_VERSION)/images/buttons"\"	\
+	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"						\
+	-DLOCATIONDIR=\""$(Locationdir)"\"							\
+	-DPREFIX=\"$(prefix)\"									\
+	-DSYSCONFDIR=\""$(sysconfdir)"\"							\
+	-DDATADIR=\""$(datadir)"\"								\
+	-DLIBDIR=\""$(datadir)"\"								\
+	-DG_LOG_DOMAIN=\"evolution-executive-summary\"						\
 	$(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
 
 IDLS =								\
@@ -80,10 +84,9 @@ libevolution_executive_summary_la_SOURCES = $(summary_sources)
 libevolution_executive_summary_la_LIBADD = $(summary_libs)
 libevolution_executive_summary_la_LDFLAGS = -module -avoid-version 
 
-Locationdir = $(datadir)/evolution
+Locationdir = $(datadir)/evolution-$(BASE_VERSION)
 Location_DATA = Locations
 
-
 # .server files
 
 server_in_files = GNOME_Evolution_Summary.server.in.in
@@ -98,7 +101,7 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files)
 
 # Glade
 
-gladedir = $(datadir)/evolution/glade
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
 glade_DATA = my-evolution.glade
 
 # GConf schemas
-- 
cgit v1.2.3