From 24112a277959156d8ad8d99cfa8b11a43fdd6db0 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Mon, 10 Feb 2003 16:53:06 +0000
Subject: Install load-pine-addressbook and load-gnomecard-addressbook into

* 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.

svn path=/trunk/; revision=19870
---
 ...E_Evolution_Addressbook_LDIF_Importer.server.in | 29 ----------------------
 ...volution_Addressbook_LDIF_Importer.server.in.in | 29 ++++++++++++++++++++++
 ..._Evolution_Addressbook_VCard_Importer.server.in | 29 ----------------------
 ...olution_Addressbook_VCard_Importer.server.in.in | 29 ++++++++++++++++++++++
 addressbook/backend/ebook/Makefile.am              | 22 ++++++++++------
 5 files changed, 73 insertions(+), 65 deletions(-)
 delete mode 100644 addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in
 create mode 100644 addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
 delete mode 100644 addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in
 create mode 100644 addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in

(limited to 'addressbook/backend')

diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in
deleted file mode 100644
index b022dcde67..0000000000
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory"
-	    type="exe"
-	    location="evolution-ldif-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import LDIF files into Evolution."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="LDAP Data Interchange Format (.ldif)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports LDIF files into Evolution."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
new file mode 100644
index 0000000000..412570d074
--- /dev/null
+++ b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
@@ -0,0 +1,29 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory"
+	    type="exe"
+	    location="@LIBEXECDIR@/evolution-ldif-importer">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+		       _value="Factory to import LDIF files into Evolution."/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer"
+	    type="factory"
+	    location="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="evolution:menu-name" type="string"
+		       value="LDAP Data Interchange Format (.ldif)"/>
+	<oaf_attribute name="description" type="string"
+		       _value="Imports LDIF files into Evolution."/>
+</oaf_server>
+
+</oaf_info>
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in
deleted file mode 100644
index 9cd4699633..0000000000
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"
-	    type="exe"
-	    location="evolution-vcard-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import VCard files into Evolution."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="VCard (.vcf, .gcrd)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports VCard files into Evolution."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
new file mode 100644
index 0000000000..23d36ab9ae
--- /dev/null
+++ b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
@@ -0,0 +1,29 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"
+	    type="exe"
+	    location="@LIBEXECDIR@/evolution-vcard-importer">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+		       _value="Factory to import VCard files into Evolution."/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Importer"
+	    type="factory"
+	    location="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="evolution:menu-name" type="string"
+		       value="VCard (.vcf, .gcrd)"/>
+	<oaf_attribute name="description" type="string"
+		       _value="Imports VCard files into Evolution."/>
+</oaf_server>
+
+</oaf_info>
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@
 
-- 
cgit v1.2.3