From 9582ff59388f35e424771b27e318410cfb81c4e0 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Tue, 19 Nov 2002 22:07:59 +0000
Subject: Added rule to generate GNOME_Evolution_Calendar.server.in from

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

* gui/GNOME_Evolution_Calendar.server.in.in: Renamed from
GNOME_Evolution_Calendar.server.in.  Prepended the executable name
with @LIBEXECDIR@.

svn path=/trunk/; revision=18847
---
 calendar/ChangeLog                                 |  12 ++
 calendar/gui/GNOME_Evolution_Calendar.server.in    | 179 ---------------------
 calendar/gui/GNOME_Evolution_Calendar.server.in.in | 179 +++++++++++++++++++++
 calendar/gui/Makefile.am                           |  11 +-
 4 files changed, 197 insertions(+), 184 deletions(-)
 delete mode 100644 calendar/gui/GNOME_Evolution_Calendar.server.in
 create mode 100644 calendar/gui/GNOME_Evolution_Calendar.server.in.in

(limited to 'calendar')

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 408a79bd7b..5bd7e91d3a 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2002-11-19  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am: Added rule to generate
+	GNOME_Evolution_Calendar.server.in from
+	GNOME_Evolution_Calendar.server.in.in, substituting @LIBEXECDIR@.
+	Also, install evolution-calendar in $libexecdir instead of
+	$bindir.
+
+	* gui/GNOME_Evolution_Calendar.server.in.in: Renamed from
+	GNOME_Evolution_Calendar.server.in.  Prepended the executable name
+	with @LIBEXECDIR@.
+
 2002-11-19  Not Zed  <NotZed@Ximian.com>
 
 	* gui/e-meeting-model.c (get_select_name_dialog): pass type to
diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in b/calendar/gui/GNOME_Evolution_Calendar.server.in
deleted file mode 100644
index 68fd2a07d0..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar.server.in
+++ /dev/null
@@ -1,179 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<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 calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="Evolution component for handling the calendar."/>
-
-	<oaf_attribute name="evolution:shell_component_icon" type="string"
-		       value="evolution-calendar.png"/>
-	<oaf_attribute name="evolution:shell_component_launch_order" type="number"
-		       value="3"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<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 sample Calendar control"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/calendar-control:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="A sample Bonobo control which displays an calendar."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_ControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<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 Evolution Tasks control"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Tasks_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/tasks-control:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="A Bonobo control which displays a task list."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory"
-            type="exe"
-            location="evolution-calendar">
-
-	<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 create a component editor factory"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Calendar/CompEditorFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory to centralize calendar component editor dialogs"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:config_item:title" type="string"
-		       _value="Calendar and Tasks"/>
-
-	<oaf_attribute name="evolution:config_item:description" type="string"
-		       _value="Configure your timezone, Calendar and Task List here "/>
-
-	<oaf_attribute name="evolution:config_item:icon_name" type="string"
-		       value="evolution-calendar.png"/>
-
-	<oaf_attribute name="evolution:config_item:type" type="stringv">
-		<item value="calendar"/>
-		<item value="tasks"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:config_item:priority" type="string" value="-7"/>
-    
-	<oaf_attribute name="description" type="string"
-		       _value="Configuration control for the Evolution Calendar."/>
-
-</oaf_server>
-
-</oaf_info>
-
diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in.in b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
new file mode 100644
index 0000000000..ea64073540
--- /dev/null
+++ b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
@@ -0,0 +1,179 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory"
+            type="exe"
+            location="@LIBEXECDIR@/evolution-calendar">
+
+	<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 calendar iTip view control"/>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control"
+            type="factory"
+            location="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Bonobo/Control:1.0"/>
+	        <item value="IDL:Bonobo/PersistStream:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
+		<item value="text/calendar"/>
+		<item value="text/x-calendar"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution calendar iTip/iMip viewer"/>
+	<oaf_attribute name="description" type="string"
+                       _value="Factory for the calendar iTip view control"/>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent"
+            type="exe"
+            location="@LIBEXECDIR@/evolution-calendar">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+	               _value="Evolution component for handling the calendar."/>
+
+	<oaf_attribute name="evolution:shell_component_icon" type="string"
+		       value="evolution-calendar.png"/>
+	<oaf_attribute name="evolution:shell_component_launch_order" type="number"
+		       value="3"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ControlFactory"
+            type="exe"
+            location="@LIBEXECDIR@/evolution-calendar">
+
+	<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 sample Calendar control"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control"
+            type="factory"
+            location="OAFIID:GNOME_Evolution_Calendar_ControlFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:BonoboControl/calendar-control:1.0"/>
+		<item value="IDL:Bonobo/Control:1.0"/>
+	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
+		<item value="text/calendar"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+	               _value="A sample Bonobo control which displays an calendar."/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_ControlFactory"
+            type="exe"
+            location="@LIBEXECDIR@/evolution-calendar">
+
+	<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 Evolution Tasks control"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control"
+            type="factory"
+            location="OAFIID:GNOME_Evolution_Tasks_ControlFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:BonoboControl/tasks-control:1.0"/>
+		<item value="IDL:Bonobo/Control:1.0"/>
+	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
+		<item value="text/calendar"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+	               _value="A Bonobo control which displays a task list."/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory"
+            type="exe"
+            location="@LIBEXECDIR@/evolution-calendar">
+
+	<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 create a component editor factory"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory"
+            type="factory"
+            location="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/Calendar/CompEditorFactory:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       _value="Factory to centralize calendar component editor dialogs"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory"
+            type="exe"
+            location="@LIBEXECDIR@/evolution-calendar">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+	</oaf_attribute>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl"
+	    type="factory"
+	    location="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="evolution:config_item:title" type="string"
+		       _value="Calendar and Tasks"/>
+
+	<oaf_attribute name="evolution:config_item:description" type="string"
+		       _value="Configure your timezone, Calendar and Task List here "/>
+
+	<oaf_attribute name="evolution:config_item:icon_name" type="string"
+		       value="evolution-calendar.png"/>
+
+	<oaf_attribute name="evolution:config_item:type" type="stringv">
+		<item value="calendar"/>
+		<item value="tasks"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="evolution:config_item:priority" type="string" value="-7"/>
+    
+	<oaf_attribute name="description" type="string"
+		       _value="Configuration control for the Evolution Calendar."/>
+
+</oaf_server>
+
+</oaf_info>
+
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 37fd67eb18..b3ba603747 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -33,7 +33,7 @@ SUBDIRS = alarm-notify dialogs
 
 help_base = $(datadir)/gnome/help/cal
 
-bin_PROGRAMS = evolution-calendar
+libexec_PROGRAMS = evolution-calendar
 
 INCLUDES = 							\
 	-DG_LOG_DOMAIN=\"calendar-gui\"				\
@@ -181,11 +181,12 @@ evolution_calendar_LDADD =								\
 
 evolution_calendar_LDFLAGS = -export-dynamic
 
-serversdir = $(libdir)/bonobo/servers
-servers_in_files = \
-	GNOME_Evolution_Calendar.server.in
+server_in_files = GNOME_Evolution_Calendar.server.in.in
 
-servers_DATA = $(servers_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@
 
-- 
cgit