diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-23 04:07:51 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-23 04:07:51 +0800 |
| commit | bc61f8e11ccdb24c8a5ad4efafb31cfb097733fe (patch) | |
| tree | 21301790bbead821c66310484253c57636936c1e /calendar/gui/alarm-notify | |
| parent | 274026702024e9ff9ab593e263b662d37ab4316e (diff) | |
| download | gsoc2013-evolution-bc61f8e11ccdb24c8a5ad4efafb31cfb097733fe.tar.gz gsoc2013-evolution-bc61f8e11ccdb24c8a5ad4efafb31cfb097733fe.tar.zst gsoc2013-evolution-bc61f8e11ccdb24c8a5ad4efafb31cfb097733fe.zip | |
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
Diffstat (limited to 'calendar/gui/alarm-notify')
| -rw-r--r-- | calendar/gui/alarm-notify/Makefile.am | 8 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/notify-main.c | 1 |
2 files changed, 4 insertions, 5 deletions
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> * |