diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-20 06:07:59 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-20 06:07:59 +0800 |
| commit | 9582ff59388f35e424771b27e318410cfb81c4e0 (patch) | |
| tree | c206d31248ca26e3c51793c86b2cfa877ad14f2e | |
| parent | 9f5ba47f8481f3052cc684fcb8be8c8827debb5b (diff) | |
| download | gsoc2013-evolution-9582ff59388f35e424771b27e318410cfb81c4e0.tar.gz gsoc2013-evolution-9582ff59388f35e424771b27e318410cfb81c4e0.tar.zst gsoc2013-evolution-9582ff59388f35e424771b27e318410cfb81c4e0.zip | |
Added rule to generate GNOME_Evolution_Calendar.server.in from
* Makefile.am: Added rule to generate
GNOME_Evolution_Calendar.server.in from
GNOME_Evolution_Calendar.server.in.in, substituting @LIBEXECDIR@.
Also, install evolution-calendar in $libexecdir instead of
$bindir.
* gui/GNOME_Evolution_Calendar.server.in.in: Renamed from
GNOME_Evolution_Calendar.server.in. Prepended the executable name
with @LIBEXECDIR@.
svn path=/trunk/; revision=18847
| -rw-r--r-- | calendar/ChangeLog | 12 | ||||
| -rw-r--r-- | calendar/gui/GNOME_Evolution_Calendar.server.in.in (renamed from calendar/gui/GNOME_Evolution_Calendar.server.in) | 12 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 11 |
3 files changed, 24 insertions, 11 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 408a79bd7b..5bd7e91d3a 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,15 @@ +2002-11-19 Ettore Perazzoli <ettore@ximian.com> + + * Makefile.am: Added rule to generate + GNOME_Evolution_Calendar.server.in from + GNOME_Evolution_Calendar.server.in.in, substituting @LIBEXECDIR@. + Also, install evolution-calendar in $libexecdir instead of + $bindir. + + * gui/GNOME_Evolution_Calendar.server.in.in: Renamed from + GNOME_Evolution_Calendar.server.in. Prepended the executable name + with @LIBEXECDIR@. + 2002-11-19 Not Zed <NotZed@Ximian.com> * gui/e-meeting-model.c (get_select_name_dialog): pass type to diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in b/calendar/gui/GNOME_Evolution_Calendar.server.in.in index 68fd2a07d0..ea64073540 100644 --- a/calendar/gui/GNOME_Evolution_Calendar.server.in +++ b/calendar/gui/GNOME_Evolution_Calendar.server.in.in @@ -2,7 +2,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory" type="exe" - location="evolution-calendar"> + location="@LIBEXECDIR@/evolution-calendar"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> @@ -36,7 +36,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent" type="exe" - location="evolution-calendar"> + location="@LIBEXECDIR@/evolution-calendar"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/> @@ -53,7 +53,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ControlFactory" type="exe" - location="evolution-calendar"> + location="@LIBEXECDIR@/evolution-calendar"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> @@ -83,7 +83,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Tasks_ControlFactory" type="exe" - location="evolution-calendar"> + location="@LIBEXECDIR@/evolution-calendar"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> @@ -113,7 +113,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory" type="exe" - location="evolution-calendar"> + location="@LIBEXECDIR@/evolution-calendar"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> @@ -138,7 +138,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory" type="exe" - location="evolution-calendar"> + location="@LIBEXECDIR@/evolution-calendar"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 37fd67eb18..b3ba603747 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -33,7 +33,7 @@ SUBDIRS = alarm-notify dialogs help_base = $(datadir)/gnome/help/cal -bin_PROGRAMS = evolution-calendar +libexec_PROGRAMS = evolution-calendar INCLUDES = \ -DG_LOG_DOMAIN=\"calendar-gui\" \ @@ -181,11 +181,12 @@ evolution_calendar_LDADD = \ evolution_calendar_LDFLAGS = -export-dynamic -serversdir = $(libdir)/bonobo/servers -servers_in_files = \ - GNOME_Evolution_Calendar.server.in +server_in_files = GNOME_Evolution_Calendar.server.in.in -servers_DATA = $(servers_in_files:.server.in=.server) +serverdir = $(libdir)/bonobo/servers +server_DATA = $(server_in_files:.server.in.in=.server) +$(server_in_files:.server.in.in=.server.in): $(server_in_files) + sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ @INTLTOOL_SERVER_RULE@ |