aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in (renamed from calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in)2
-rw-r--r--calendar/gui/alarm-notify/Makefile.am6
3 files changed, 13 insertions, 3 deletions
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.in
index 86f5c71493..c6cba0a7f9 100644
--- a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in
+++ b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
@@ -2,7 +2,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory"
type="exe"
- location="evolution-alarm-notify">
+ location="@LIBEXECDIR@/evolution-alarm-notify">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/ObjectFactory:1.0"/>
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@