From 19043324eec8bab62d4cfd69ff78b11335ddebb4 Mon Sep 17 00:00:00 2001
From: Rodney Dawes <dobey@ximian.com>
Date: Fri, 7 Feb 2003 23:05:57 +0000
Subject: remove this file, as it's generated now Add this file to generate the

2003-02-07  Rodney Dawes  <dobey@ximian.com>

	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in:
	remove this file, as it's generated now
	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
	Add this file to generate the .server.in from, with hardcoded path
	* gui/alarm-notify/Makefile.am: Hardcode path in server file

svn path=/trunk/; revision=19851
---
 calendar/ChangeLog                                 |  8 ++++++++
 .../GNOME_Evolution_Calendar_AlarmNotify.server.in | 24 ----------------------
 ...OME_Evolution_Calendar_AlarmNotify.server.in.in | 24 ++++++++++++++++++++++
 calendar/gui/alarm-notify/Makefile.am              |  6 ++++--
 4 files changed, 36 insertions(+), 26 deletions(-)
 delete mode 100644 calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in
 create mode 100644 calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in

(limited to 'calendar')

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f3276cd515..961ce9cb02 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-07  Rodney Dawes  <dobey@ximian.com>
+
+	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in:
+	remove this file, as it's generated now
+	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
+	Add this file to generate the .server.in from, with hardcoded path
+	* gui/alarm-notify/Makefile.am: Hardcode path in server file
+	
 2003-02-07  Rodrigo Moya <rodrigo@ximian.com>
 	
 	Fixes #37706
diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in
deleted file mode 100644
index 86f5c71493..0000000000
--- a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory"
-            type="exe"
-            location="evolution-alarm-notify">
-
-	<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 alarm notification service"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory">
-
-	<oaf_attribute name="description" type="string"
-                       _value="Alarm notification service"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
new file mode 100644
index 0000000000..c6cba0a7f9
--- /dev/null
+++ b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
@@ -0,0 +1,24 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory"
+            type="exe"
+            location="@LIBEXECDIR@/evolution-alarm-notify">
+
+	<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 alarm notification service"/>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify"
+            type="factory"
+            location="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory">
+
+	<oaf_attribute name="description" type="string"
+                       _value="Alarm notification service"/>
+</oaf_server>
+
+</oaf_info>
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 4766db866a..42ec4d847d 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -59,9 +59,11 @@ evolution_alarm_notify_LDADD =						\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 server_in_files = \
-	GNOME_Evolution_Calendar_AlarmNotify.server.in
+	GNOME_Evolution_Calendar_AlarmNotify.server.in.in
 
-server_DATA = $(server_in_files:.server.in=.server)
+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