Use EVOLUTION_GALVIEWSDIR.

* gui/gnome-cal.c (gnome_calendar_setup_view_menus): Use
EVOLUTION_GALVIEWSDIR.

* gui/e-tasks.c (e_tasks_setup_view_menus): Use
EVOLUTION_GALVIEWSDIR.

* cal-util/Makefile.am: Install libcal-util.la in $(privlibdir)
instead of $(libdir).

* gui/dialogs/comp-editor.c (setup_widgets): Get
evolution-comp-editor.xml from EVOLUTION_UIDIR.
(comp_editor_merge_ui): Get the file in EVOLUTION_UIDIR.

* gui/tasks-control.c (tasks_control_activate): Get
evolution-tasks.xml from EVOLUTION_UI_DIRECTORY.

* gui/calendar-commands.c (calendar_control_activate): Get
evolution-calendar.xml from EVOLUTION_UI_DIRECTORY.

* pcs/Makefile.am (pcsincludedir): Version using $(BASE_VERSION).

* importers/Makefile.am: Install evolution-calendar-importer in
$(libexecdir)/evolution/$(BASE_VERSION).
(sounddir): Remove.

* gui/dialogs/Makefile.am (iconsdir): Version using
$(BASE_VERSION).
(gladedir): Likewise.
(etspecdir): Likewise.

* gui/Makefile.am (help_base): Remove.
(install-data-local): Do not make the $(help_base)/C directory.
(etspecdir): Version using $(BASE_VERSION).
(gladedir): Likewise.
(iconsdir): Likewise.
(INCLUDES): Update the EVOLUTION_IMAGESDIR define to be versioned,
and add a -DEVOLUTION_GALVIEWSDIR.

* cal-util/Makefile.am: Install evolution-alarm-notify in
$(libexecdir)/evolution/$(BASE_VERSION).

* cal-util/Makefile.am (libcal_utilincludedir): Version using
$(BASE_VERSION).
* gui/alarm-notify/Makefile.am (iconsdir): Likewise.
(gladedir): Likewise.

* cal-client/Makefile.am: Install libcal-client.la in privlibdir
instead of libdir.
(libcal_clientincludedir): Version using $(BASE_VERSION).

svn path=/trunk/; revision=19553

9 files changed, 44 insertions, 40 deletions

diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 5ccdb1fec1..066e47f91e 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -31,41 +31,41 @@ BUILT_SOURCES = $(IDL_GENERATED)
 
 SUBDIRS = alarm-notify dialogs
 
-help_base = $(datadir)/gnome/help/cal
-
 componentdir = $(COMPONENT_DIR)
 component_LTLIBRARIES = libevolution-calendar.la
 
-INCLUDES = 							\
-	-DG_LOG_DOMAIN=\"calendar-gui\"				\
-	-I$(top_builddir)/shell					\
-	-I$(top_srcdir)/shell					\
-	-I$(top_srcdir)						\
-	-I$(top_srcdir)/calendar				\
-	-I$(top_srcdir)/calendar/cal-client			\
-	-I$(top_builddir)/calendar/cal-client			\
-	-I$(top_srcdir)/libical/src/libical			\
-	-I$(top_builddir)/libical/src/libical			\
-	-I$(top_srcdir)/addressbook/backend			\
-	-I$(top_builddir)/addressbook/backend			\
-	-I$(top_srcdir)/widgets					\
-	-I$(includedir)						\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-        -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"        	\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution/images\" \
+INCLUDES =										\
+	-DG_LOG_DOMAIN=\"calendar-gui\"							\
+	-I$(top_builddir)/shell								\
+	-I$(top_srcdir)/shell								\
+	-I$(top_srcdir)									\
+	-I$(top_srcdir)/calendar							\
+	-I$(top_srcdir)/calendar/cal-client						\
+	-I$(top_builddir)/calendar/cal-client						\
+	-I$(top_srcdir)/libical/src/libical						\
+	-I$(top_builddir)/libical/src/libical						\
+	-I$(top_srcdir)/addressbook/backend						\
+	-I$(top_builddir)/addressbook/backend						\
+	-I$(top_srcdir)/widgets								\
+	-I$(includedir)									\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"						\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"						\
+        -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"					\
+	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"						\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"					\
+	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/images\"		\
+	-DEVOLUTION_GALVIEWSDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/views\"	\
+	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""					\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
-iconsdir = $(datadir)/evolution/images
+iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images
 
-gladedir   = $(datadir)/evolution/glade
+gladedir   = $(datadir)/evolution-$(BASE_VERSION)/glade
 glade_DATA = 					\
 	e-itip-control.glade			\
 	goto-dialog.glade
 
-etspecdir = $(datadir)/evolution/etspec/
+etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec/
 etspec_DATA = e-calendar-table.etspec e-meeting-time-sel.etspec
 
 libevolution_calendar_la_SOURCES =		\
@@ -200,7 +200,6 @@ EXTRA_DIST =	 			\
 CLEANFILES = $(BUILT_SOURCES)
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
 	$(mkinstalldirs) $(Conduitsdir)
 
 dist-hook:
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index d8c5a9e0cd..6c0e938567 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -11,7 +11,8 @@ idl_flags = $(IDL_INCLUDES)
 $(CORBA_GENERATED): $(idls)
 	$(ORBIT_IDL) $(idl_flags) $(top_srcdir)/calendar/idl/evolution-calendar.idl
 
-bin_PROGRAMS = evolution-alarm-notify
+evolibexecdir = $(libexecdir)/evolution/$(BASE_VERSION)
+evolibexec_PROGRAMS = evolution-alarm-notify
 
 noinst_LIBRARIES = libalarm.a
 
@@ -34,9 +35,8 @@ INCLUDES = 						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
-iconsdir = $(datadir)/evolution/images
-
-gladedir   = $(datadir)/evolution/glade
+iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images
+gladedir   = $(datadir)/evolution-$(BASE_VERSION)/glade
 
 glade_DATA =		\
 	alarm-notify.glade
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 77e5694fba..6889029c98 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -1,7 +1,6 @@
 /* Evolution calendar - Alarm notification service main file
  *
  * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
  *
  * Author: Federico Mena-Quintero <federico@ximian.com>
  *
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 3140b1fc90..854ded3825 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -720,7 +720,7 @@ calendar_control_activate (BonoboControl *control,
 	bonobo_ui_component_freeze (uic, NULL);
 
 	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-calendar.xml",
+			       EVOLUTION_UIDIR "/evolution-calendar.xml",
 			       "evolution-calendar",
 			       NULL);
 
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 31c785c16a..cf7772c6d0 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -29,6 +29,7 @@ INCLUDES = 								\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
 	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"				\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
+	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"			\
         -DGNOMELOCALEDIR=\""$(localedir)"\"				\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
@@ -77,9 +78,9 @@ libcal_dialogs_a_SOURCES =	\
 	task-page.c		\
 	task-page.h
 
-iconsdir = $(datadir)/evolution/images
+iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images
 
-gladedir = $(datadir)/evolution/glade
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
 glade_DATA =				\
 	alarm-options.glade		\
 	alarm-page.glade		\
@@ -92,7 +93,7 @@ glade_DATA =				\
 	task-details-page.glade		\
 	task-page.glade
 
-etspecdir = $(datadir)/evolution/etspec/
+etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec/
 etspec_DATA = meeting-page.etspec
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 46a08da33d..24fdf3396f 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -197,7 +197,7 @@ setup_widgets (CompEditor *editor)
 
 	bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor);
 	bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR,
-			       "evolution-comp-editor.xml",
+			       EVOLUTION_UIDIR "/evolution-comp-editor.xml",
 			       "evolution-calendar", NULL);
 	e_pixmaps_update (priv->uic, pixmaps);
 
@@ -1094,15 +1094,20 @@ comp_editor_merge_ui (CompEditor *editor,
 		      EPixmap *component_pixmaps)
 {
 	CompEditorPrivate *priv;
+	char *path;
 
 	g_return_if_fail (editor != NULL);
 	g_return_if_fail (IS_COMP_EDITOR (editor));
 
 	priv = editor->priv;
 
-	bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR, filename, "evolution-calendar", NULL);
+	path = g_strconcat (EVOLUTION_UIDIR "/", filename);
+
+	bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR, path, "evolution-calendar", NULL);
 	bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor);
 
+	g_free (path);
+
 	if (component_pixmaps != NULL)
 		e_pixmaps_update (priv->uic, component_pixmaps);
 }
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index c8a9d0f77e..4ce3d32072 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -736,7 +736,7 @@ e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic)
 
 		dir = gnome_util_prepend_user_home ("/evolution/views/tasks/");
 		gal_view_collection_set_storage_directories (collection,
-							     EVOLUTION_DATADIR "/evolution/views/tasks/",
+							     EVOLUTION_GALVIEWSDIR "/tasks/",
 							     dir);
 		g_free (dir);
 
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 53860db7c7..33b5fc8849 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1342,7 +1342,7 @@ gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)
 
 		path = gnome_util_prepend_user_home ("/evolution/views/calendar/");
 		gal_view_collection_set_storage_directories (collection,
-							     EVOLUTION_DATADIR "/evolution/views/calendar/",
+							     EVOLUTION_GALVIEWSDIR "/evolution/views/calendar/",
 							     path);
 		g_free (path);
 
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 1716758edb..e5d4b5b153 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -320,7 +320,7 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks)
 	bonobo_ui_component_freeze (uic, NULL);
 
 	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-tasks.xml",
+			       EVOLUTION_UIDIR "/evolution-tasks.xml",
 			       "evolution-tasks",
 			       NULL);