aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in (renamed from addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in)2
-rw-r--r--addressbook/gui/component/select-names/Makefile.am10
3 files changed, 13 insertions, 5 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 95187320fd..4a78bd67c2 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-19 Ettore Perazzoli <ettore@ximian.com>
+
+ * gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in,
+ * gui/component/select-names/Makefile.am: Same changes as below
+ for the SelectNames component.
+
2002-11-18 Chris Toshok <toshok@ximian.com>
* gui/component/select-names/e-select-names.c
diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
index 7f26e2aaed..2697741fc7 100644
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in
+++ b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
@@ -2,7 +2,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"
type="exe"
- location="evolution-addressbook">
+ location="@LIBEXECDIR@/evolution-addressbook">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/ObjectFactory:1.0"/>
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index dc921223f2..deee27fca0 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -17,10 +17,12 @@ $(IDL_GENERATED): $(idl_DATA)
$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \
$(srcdir)/Evolution-Addressbook-SelectNames.idl
-serversdir = $(libdir)/bonobo/servers
+server_in_files = GNOME_Evolution_Addressbook_SelectNames.server.in.in
-server_in_files = GNOME_Evolution_Addressbook_SelectNames.server.in
-servers_DATA = $(server_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@
@@ -93,7 +95,7 @@ etspec_DATA = e-select-names.etspec
EXTRA_DIST = \
$(glade_DATA) \
$(server_in_files) \
- $(servers_DATA) \
+ $(server_DATA) \
$(idl_DATA) \
$(etspec_DATA) \
e-select-names-marshal.list