aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--wombat/ChangeLog15
-rw-r--r--wombat/GNOME_Evolution_WombatLDAP.server.in.in (renamed from wombat/GNOME_Evolution_WombatLDAP.server.in)8
-rw-r--r--wombat/GNOME_Evolution_WombatNOLDAP.server.in.in (renamed from wombat/GNOME_Evolution_WombatNOLDAP.server.in)0
-rw-r--r--wombat/Makefile.am18
4 files changed, 30 insertions, 11 deletions
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 0cfe6e58e5..38f7dcb342 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,18 @@
+2002-11-15 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am: Added rule to create
+ GNOME_Evolution_Wombat.server.in from
+ GNOME_Evolution_Wombat.server.in.in, substituting @LIBEXECDIR@.
+ Also install wombat in $libexecdir instead of $bindir.
+
+ * GNOME_Evolution_WombatNOLDAP.server.in.in: Renamed from
+ GNOME_Evolution_WombatNOLDAP.server.in. Changed the location from
+ "wombat" to "@LIBEXECDIR@/wombat".
+
+ * GNOME_Evolution_WombatLDAP.server.in.in: Renamed from
+ GNOME_Evolution_WombatLDAP.server.in. Changed the location from
+ "wombat" to "@LIBEXECDIR@/wombat".
+
2002-11-07 Rodrigo Moya <rodrigo@ximian.com>
* wombat.c: re-enabled calendar parts.
diff --git a/wombat/GNOME_Evolution_WombatLDAP.server.in b/wombat/GNOME_Evolution_WombatLDAP.server.in.in
index 9fc4ec2602..3f3d6e57d0 100644
--- a/wombat/GNOME_Evolution_WombatLDAP.server.in
+++ b/wombat/GNOME_Evolution_WombatLDAP.server.in.in
@@ -2,7 +2,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory"
type="exe"
- location="wombat">
+ location="@LIBEXECDIR@/wombat">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
@@ -20,7 +20,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
type="exe"
- location="wombat">
+ location="@LIBEXECDIR@/wombat">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
@@ -32,7 +32,7 @@
</oaf_server>
-<oaf_server iid="OAFIID:Bonobo_Moniker_wombat_Factory" type="exe" location="wombat">
+<oaf_server iid="OAFIID:Bonobo_Moniker_wombat_Factory" type="exe" location="@LIBEXECDIR@/wombat">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
@@ -53,7 +53,7 @@
</oaf_server>
-<oaf_server iid="OAFIID:Bonobo_Moniker_wombat_private_Factory" type="exe" location="wombat">
+<oaf_server iid="OAFIID:Bonobo_Moniker_wombat_private_Factory" type="exe" location="@LIBEXECDIR@/wombat">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
diff --git a/wombat/GNOME_Evolution_WombatNOLDAP.server.in b/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in
index 88671c411e..88671c411e 100644
--- a/wombat/GNOME_Evolution_WombatNOLDAP.server.in
+++ b/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index a360e76e85..61e9c91b6d 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES = \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
$(WOMBAT_CFLAGS)
-bin_PROGRAMS = \
+libexec_PROGRAMS = \
wombat
wombat_SOURCES = \
@@ -50,16 +50,20 @@ wombat_LDADD = \
serversdir = $(libdir)/bonobo/servers
if ENABLE_LDAP
-SERVER_IN_FILE=GNOME_Evolution_WombatLDAP.server.in
+SERVER_IN_FILE=GNOME_Evolution_WombatLDAP.server.in.in
else
-SERVER_IN_FILE=GNOME_Evolution_WombatNOLDAP.server.in
+SERVER_IN_FILE=GNOME_Evolution_WombatNOLDAP.server.in.in
endif
-GNOME_Evolution_Wombat.server.in: $(SERVER_IN_FILE)
+GNOME_Evolution_Wombat.server.in.in: $(SERVER_IN_FILE)
cp $< $@
-server_in_files = GNOME_Evolution_Wombat.server.in
-servers_DATA = $(server_in_files:.server.in=.server)
+server_in_files = GNOME_Evolution_Wombat.server.in.in
+
+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@
@@ -67,7 +71,7 @@ idldir = $(datadir)/idl
idl_DATA = Evolution-Wombat.idl
-EXTRA_DIST = $(servers_DATA) $(server_in_files) $(idl_DATA) \
+EXTRA_DIST = $(server_DATA) $(server_in_files) $(idl_DATA) \
GNOME_Evolution_WombatLDAP.server.in GNOME_Evolution_WombatNOLDAP.server.in
if ENABLE_PURIFY