aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog52
-rw-r--r--calendar/cal-client/Makefile.am4
-rw-r--r--calendar/cal-util/Makefile.am5
-rw-r--r--calendar/gui/Makefile.am51
-rw-r--r--calendar/gui/alarm-notify/Makefile.am8
-rw-r--r--calendar/gui/alarm-notify/notify-main.c1
-rw-r--r--calendar/gui/calendar-commands.c2
-rw-r--r--calendar/gui/dialogs/Makefile.am7
-rw-r--r--calendar/gui/dialogs/comp-editor.c9
-rw-r--r--calendar/gui/e-tasks.c2
-rw-r--r--calendar/gui/gnome-cal.c2
-rw-r--r--calendar/gui/tasks-control.c2
-rw-r--r--calendar/importers/Makefile.am5
-rw-r--r--calendar/pcs/Makefile.am2
14 files changed, 103 insertions, 49 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8b1695c2de..042f514523 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,55 @@
+2003-01-22 Ettore Perazzoli <ettore@ximian.com>
+
+ * 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).
+
2003-01-18 Hans Petter Jansson <hpj@ximian.com>
* gui/print.c (print_calendar): Create a GnomePrintDialog,
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index acd994499d..50cd31e912 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -34,9 +34,9 @@ INCLUDES = \
-I$(top_srcdir)/libwombat \
$(EVOLUTION_CALENDAR_CFLAGS)
-lib_LTLIBRARIES = libcal-client.la
+privlib_LTLIBRARIES = libcal-client.la
-libcal_clientincludedir = $(includedir)/evolution/cal-client
+libcal_clientincludedir = $(includedir)/evolution-$(BASE_VERSION)/cal-client
libcal_client_la_SOURCES = \
$(CORBA_SOURCES_GENERATED) \
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
index 711f8d00d4..e739305661 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -16,8 +16,7 @@ INCLUDES = \
# cal util library
#
-lib_LTLIBRARIES = libcal-util.la
-privlib_LTLIBRARIES = libcal-util-static.la
+privlib_LTLIBRARIES = libcal-util-static.la libcal-util.la
libcal_util_la_SOURCES = \
cal-util-marshal.c \
@@ -27,7 +26,7 @@ libcal_util_la_SOURCES = \
cal-util.c \
timeutil.c
-libcal_utilincludedir = $(includedir)/evolution/cal-util
+libcal_utilincludedir = $(includedir)/evolution-$(BASE_VERSION)/cal-util
libcal_utilinclude_HEADERS = \
cal-component.h \
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);
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index 7e385ff477..ff680f4d38 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -1,6 +1,5 @@
-bin_PROGRAMS = evolution-calendar-importer
-
-sounddir = $(datadir)/evolution/sounds
+evolibexecdir = $(libexecdir)/evolution/$(BASE_VERSION)
+evolibexecdir_PROGRAMS = evolution-calendar-importer
INCLUDES = \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
index 3432837685..ebb1e7c81c 100644
--- a/calendar/pcs/Makefile.am
+++ b/calendar/pcs/Makefile.am
@@ -28,7 +28,7 @@ idl_flags = -I $(srcdir) $(IDL_INCLUDES)
$(CORBA_GENERATED): $(idls)
$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
-pcsincludedir = $(includedir)/evolution/pcs
+pcsincludedir = $(includedir)/evolution-$(BASE_VERSION)/pcs
privlib_LIBRARIES = libpcs.a
noinst_LIBRARIES = libpcsfile.a
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 21:34:15 +0800