aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/GNOME_Evolution_Mail.server.in.in18
-rw-r--r--mail/Makefile.am12
3 files changed, 25 insertions, 14 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 7304fca790..20d1ec20df 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-15 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am: Add rules to substitute @LIBEXEC@ in
+ GNOME_Evolution_Mail.server.in.in and install evolution-mail in
+ $(libexecdir) instead of $(bindir).
+
+ * GNOME_Evolution_Mail.server.in.in: Replaced evolution-mail with
+ @LIBEXECDIR@/evolution-mail.
+
2002-11-15 Rodney Dawes <dobey@ximian.com>
* component-factory.c: Use bonobo_main_quit instead of gtk
diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in
index 4d6f4ea33a..929d988c00 100644
--- a/mail/GNOME_Evolution_Mail.server.in.in
+++ b/mail/GNOME_Evolution_Mail.server.in.in
@@ -19,7 +19,7 @@
<!-- (factory) -->
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ControlFactory"
type="exe"
- location="evolution-mail">
+ location="@LIBEXECDIR@/evolution-mail">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/ObjectFactory:1.0"/>
@@ -33,7 +33,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponent"
type="exe"
- location="evolution-mail">
+ location="@LIBEXECDIR@/evolution-mail">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
@@ -52,7 +52,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory"
type="exe"
- location="evolution-mail">
+ location="@LIBEXECDIR@/evolution-mail">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
@@ -79,7 +79,7 @@
<!-- (factory) -->
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerFactory"
type="exe"
- location="evolution-mail">
+ location="@LIBEXECDIR@/evolution-mail">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
@@ -106,7 +106,7 @@
<!-- Config Wizard interface -->
<oaf_server iid="OAFIID:GNOME_Evolution_MailConfig_Factory"
type="exe"
- location="evolution-mail">
+ location="@LIBEXECDIR@/evolution-mail">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
@@ -130,7 +130,7 @@
<!-- (factory) -->
<oaf_server iid="OAFIID:GNOME_Evolution_MailConfig_Factory"
type="exe"
- location="evolution-mail">
+ location="@LIBEXECDIR@/evolution-mail">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
@@ -155,7 +155,7 @@
<!-- (factory) -->
<oaf_server iid="OAFIID:GNOME_Evolution_FolderInfo_Factory"
type="exe"
- location="evolution-mail">
+ location="@LIBEXECDIR@/evolution-mail">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
@@ -177,7 +177,7 @@
<!-- (factory) -->
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Wizard_Factory"
type="exe"
- location="evolution-mail">
+ location="@LIBEXECDIR@/evolution-mail">
</oaf_server>
<!-- (wizard) -->
@@ -192,7 +192,7 @@
<!-- (factory) -->
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ConfigControlFactory"
type="exe"
- location="evolution-mail">
+ location="@LIBEXECDIR@/evolution-mail">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 9d4bf67dba..645b952bbc 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -1,6 +1,6 @@
#SUBDIRS = importers
-bin_PROGRAMS = \
+libexec_PROGRAMS = \
evolution-mail
# evolution-mail-upgrade
@@ -163,10 +163,12 @@ evolution_mail_LDFLAGS = \
# $(top_builddir)/e-util/libeutil.la \
# $(EVOLUTION_MAIL_LIBS)
-serverdir = $(libdir)/bonobo/servers
-server_in_files = GNOME_Evolution_Mail.server.in
-server_DATA = $(server_in_files:.server.in=.server)
+server_in_files = GNOME_Evolution_Mail.server.in.in
+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@
gladedir = $(datadir)/evolution/glade
@@ -188,7 +190,7 @@ EXTRA_DIST = \
Mailer.idl \
$(SPELL_IDL) \
$(glade_DATA) \
- $(server_in_files) \
+ $(server_in_files) \
$(server_DATA) \
$(etspec_DATA)