From e0edfe0bcaf6b554b190f92a1eb358db3804af56 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Fri, 15 Nov 2002 22:05:13 +0000
Subject: Added rule to generate GNOME_Evolution_Summary.server.in from

* Makefile.am: Added rule to generate
GNOME_Evolution_Summary.server.in from
GNOME_Evolution_Summary.server.in.in, substituting @LIBEXECDIR@.
Also, install evolution-executive-summary in $libexecdir instead
of $bindir.

* GNOME_Evolution_Summary.server.in.in: Removed the @OAF_SHLIB_*@
stuff and added @LIBEXECDIR@/ to the executable's name instead.

svn path=/trunk/; revision=18791
---
 my-evolution/ChangeLog                            | 11 +++++++++++
 my-evolution/GNOME_Evolution_Summary.server.in.in |  8 ++++----
 my-evolution/Makefile.am                          | 12 +++++-------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 5d46bcf02e..8df7cf1f68 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,14 @@
+2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am: Added rule to generate
+	GNOME_Evolution_Summary.server.in from
+	GNOME_Evolution_Summary.server.in.in, substituting @LIBEXECDIR@.
+	Also, install evolution-executive-summary in $libexecdir instead
+	of $bindir.
+
+	* GNOME_Evolution_Summary.server.in.in: Removed the @OAF_SHLIB_*@
+	stuff and added @LIBEXECDIR@/ to the executable's name instead.
+
 2002-11-14  Ettore Perazzoli  <ettore@ximian.com>
 
 	* my-evolution.glade: Converted to Glade 2.
diff --git a/my-evolution/GNOME_Evolution_Summary.server.in.in b/my-evolution/GNOME_Evolution_Summary.server.in.in
index 15bbde0de7..523fa9fbce 100644
--- a/my-evolution/GNOME_Evolution_Summary.server.in.in
+++ b/my-evolution/GNOME_Evolution_Summary.server.in.in
@@ -18,8 +18,8 @@
   </oaf_server>
 
   <oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"
-	      type="@OAF_SHLIB_TYPE@"
-	      location="@OAF_SHLIB_PREFIX@evolution-executive-summary@OAF_SHLIB_SUFFIX@">
+	      type="exe"
+	      location="@LIBEXECDIR@/evolution-executive-summary">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/GenericFactory:1.0"/>
@@ -31,8 +31,8 @@
   </oaf_server>
 
   <oaf_server iid="OAFIID:GNOME_Evolution_Summary_ConfigControlFactory"
-	      type="@OAF_SHLIB_TYPE@"
-	      location="@OAF_SHLIB_PREFIX@evolution-executive-summary@OAF_SHLIB_SUFFIX@">
+	      type="exe"
+	      location="@LIBEXECDIR@/evolution-executive-summary">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/GenericFactory:1.0"/>
diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am
index afa40fe773..b05e0d3c8a 100644
--- a/my-evolution/Makefile.am
+++ b/my-evolution/Makefile.am
@@ -89,7 +89,7 @@ libevolution_executive_summary_la_LIBADD = \
 
 else
 
-bin_PROGRAMS = evolution-executive-summary
+libexec_PROGRAMS = evolution-executive-summary
 
 evolution_executive_summary_SOURCES =		\
 	$(summary_sources)			\
@@ -103,12 +103,12 @@ endif
 Locationdir = $(datadir)/evolution
 Location_DATA = Locations
 
-server_files = GNOME_Evolution_Summary.server
-server_in_files = $(server_files:.server=.server.in)
-server_in_in_files  = $(server_files:.server=.server.in.in)
+server_in_files = GNOME_Evolution_Summary.server.in.in
 
 serverdir = $(libdir)/bonobo/servers
-server_DATA = $(server_files)
+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)|" $< > $@
 
 gladedir = $(datadir)/evolution/glade
 glade_DATA = my-evolution.glade
@@ -118,9 +118,7 @@ glade_DATA = my-evolution.glade
 EXTRA_DIST = 				\
 	$(summary_sources)		\
 	$(summary_exe_sources)		\
-	$(server_files)			\
 	$(server_in_files)		\
-	$(server_in_in_files)		\
 	$(server_DATA)			\
 	$(Location_DATA)		\
 	$(glade_DATA)			\
-- 
cgit