From b39725006cebc16f96cc2d43885697d464365183 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Fri, 15 Nov 2002 22:20:41 +0000 Subject: Added rule to create GNOME_Evolution_Wombat.server.in from * 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 --- wombat/ChangeLog | 15 +++++ wombat/GNOME_Evolution_WombatLDAP.server.in | 76 ------------------------ wombat/GNOME_Evolution_WombatLDAP.server.in.in | 76 ++++++++++++++++++++++++ wombat/GNOME_Evolution_WombatNOLDAP.server.in | 75 ----------------------- wombat/GNOME_Evolution_WombatNOLDAP.server.in.in | 75 +++++++++++++++++++++++ wombat/Makefile.am | 18 +++--- 6 files changed, 177 insertions(+), 158 deletions(-) delete mode 100644 wombat/GNOME_Evolution_WombatLDAP.server.in create mode 100644 wombat/GNOME_Evolution_WombatLDAP.server.in.in delete mode 100644 wombat/GNOME_Evolution_WombatNOLDAP.server.in create mode 100644 wombat/GNOME_Evolution_WombatNOLDAP.server.in.in 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 + + * 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 * wombat.c: re-enabled calendar parts. diff --git a/wombat/GNOME_Evolution_WombatLDAP.server.in b/wombat/GNOME_Evolution_WombatLDAP.server.in deleted file mode 100644 index 9fc4ec2602..0000000000 --- a/wombat/GNOME_Evolution_WombatLDAP.server.in +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wombat/GNOME_Evolution_WombatLDAP.server.in.in b/wombat/GNOME_Evolution_WombatLDAP.server.in.in new file mode 100644 index 0000000000..3f3d6e57d0 --- /dev/null +++ b/wombat/GNOME_Evolution_WombatLDAP.server.in.in @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wombat/GNOME_Evolution_WombatNOLDAP.server.in b/wombat/GNOME_Evolution_WombatNOLDAP.server.in deleted file mode 100644 index 88671c411e..0000000000 --- a/wombat/GNOME_Evolution_WombatNOLDAP.server.in +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in b/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in new file mode 100644 index 0000000000..88671c411e --- /dev/null +++ b/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 -- cgit