aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog19
-rw-r--r--addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in (renamed from addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in)2
-rw-r--r--addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in (renamed from addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in)2
-rw-r--r--addressbook/backend/ebook/Makefile.am22
4 files changed, 36 insertions, 9 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6544bddc37..3492049fee 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,22 @@
+2003-02-10 Ettore Perazzoli <ettore@ximian.com>
+
+ * backend/ebook/Makefile.am: Install load-pine-addressbook and
+ load-gnomecard-addressbook into ${privdatadir}/tools. Install
+ evolution-vcard-importer and evolution-ldif-importer into
+ ${privlibexecdir}.
+
+ * backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in:
+ Removed.
+
+ * backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in:
+ Removed.
+
+ * backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
+ New. Specify an absolute path for the executable, using
+ @LIBEXECDIR@.
+ * backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
+ Likewise.
+
2003-02-09 Chris Toshok <toshok@ximian.com>
* gui/component/select-names/e-select-names-completion.c
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
index b022dcde67..412570d074 100644
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in
+++ b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
@@ -2,7 +2,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory"
type="exe"
- location="evolution-ldif-importer">
+ location="@LIBEXECDIR@/evolution-ldif-importer">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/ObjectFactory:1.0"/>
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
index 9cd4699633..23d36ab9ae 100644
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in
+++ b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
@@ -2,7 +2,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"
type="exe"
- location="evolution-vcard-importer">
+ location="@LIBEXECDIR@/evolution-vcard-importer">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/ObjectFactory:1.0"/>
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index a1b39a6b8f..0342715622 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -1,9 +1,13 @@
noinst_PROGRAMS = test-card test-client test-client-list
-bin_PROGRAMS = evolution-vcard-importer \
- evolution-ldif-importer \
- load-pine-addressbook \
- load-gnomecard-addressbook
+privlibexec_PROGRAMS = \
+ evolution-vcard-importer \
+ evolution-ldif-importer
+
+toolsdir = $(privdatadir)/tools
+tools_PROGRAMS = \
+ load-pine-addressbook \
+ load-gnomecard-addressbook
# CORBA stuff
@@ -206,9 +210,13 @@ CLEANFILES = $(BUILT_SOURCES)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES) $(CORBA_SOURCE_C)
-server_in_files = GNOME_Evolution_Addressbook_VCard_Importer.server.in \
- GNOME_Evolution_Addressbook_LDIF_Importer.server.in
-server_DATA = $(server_in_files:.server.in=.server)
+server_in_files = GNOME_Evolution_Addressbook_VCard_Importer.server.in.in \
+ GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
+
+server_DATA = $(server_in_files:.server.in.in=.server)
+$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+ sed -e "s|\@LIBEXECDIR\@|$(privlibexecdir)|" $< > $@
+
@INTLTOOL_SERVER_RULE@