callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added rule to create GNOME_Evolution_Wombat.server.in from

Browse Source 
* 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".

svn path=/trunk/; revision=18795
This commit is contained in:
Ettore Perazzoli
2002-11-15 22:20:41 +00:00
parent a47eb7a9a1
commit b39725006c
4 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wombat/ChangeLog
View File

@ -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.

8
wombat/GNOME_Evolution_WombatLDAP.server.in → wombat/GNOME_Evolution_WombatLDAP.server.in.in
View File

@ -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>

0
wombat/GNOME_Evolution_WombatNOLDAP.server.in → wombat/GNOME_Evolution_WombatNOLDAP.server.in.in
View File

18
wombat/Makefile.am
View File

@ -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