From b86382d56d966fdde03146eced44d15fdfab69c3 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Tue, 19 Nov 2002 21:28:39 +0000
Subject: 
 gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.

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

svn path=/trunk/; revision=18845
---
 addressbook/ChangeLog                              |  6 +++++
 ...OME_Evolution_Addressbook_SelectNames.server.in | 29 ----------------------
 ..._Evolution_Addressbook_SelectNames.server.in.in | 29 ++++++++++++++++++++++
 addressbook/gui/component/select-names/Makefile.am | 10 +++++---
 4 files changed, 41 insertions(+), 33 deletions(-)
 delete mode 100644 addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in
 create mode 100644 addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in

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
deleted file mode 100644
index 7f26e2aaed..0000000000
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Addressbook's name selection interface"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Evolution's addressbook name selection interface."/>
-
-</oaf_server>
-
-</oaf_info>
\ No newline at end of file
diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
new file mode 100644
index 0000000000..2697741fc7
--- /dev/null
+++ b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
@@ -0,0 +1,29 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"
+            type="exe"
+            location="@LIBEXECDIR@/evolution-addressbook">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       _value="Factory for the Addressbook's name selection interface"/>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames"
+            type="factory"
+            location="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       _value="Evolution's addressbook name selection interface."/>
+
+</oaf_server>
+
+</oaf_info>
\ No newline at end of file
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
-- 
cgit v1.2.3