From a47eb7a9a182c9d124fa8c98c852b0bdcfa245f4 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Fri, 15 Nov 2002 22:13:52 +0000
Subject: Added rule to generate GNOME_Evolution_Addressbook.server.in from

* gui/component/Makefile.am: Added rule to generate
GNOME_Evolution_Addressbook.server.in from
GNOME_Evolution_Addressbook.server.in.in, substituting
@LIBEXECDIR@.

* GNOME_Evolution_Addressbook.server.in.in: Renamed from
GNOME_Evolution_Addressbook.server.in.  Added @LIBEXECDIR@ before
the location of the executable.

* gui/component/select-names/select-names.glade: Ported to Glade
2.

* gui/component/select-names/recipient.glade: Ported to Glade 2.

svn path=/trunk/; revision=18794
---
 addressbook/gui/component/Makefile.am | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'addressbook/gui/component/Makefile.am')

diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index c3be7a7f81..2dc9972641 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -27,7 +27,7 @@ INCLUDES =							\
 	$(LDAP_CFLAGS)						\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-bin_PROGRAMS =	\
+libexec_PROGRAMS =	\
 	evolution-addressbook
 
 evolution_addressbook_SOURCES = 	\
@@ -68,11 +68,13 @@ evolution_addressbook_LDADD =								\
 # not done yet:
 #	$(top_builddir)/filter/libfilter.la
 
-@INTLTOOL_SERVER_RULE@
+server_in_files = GNOME_Evolution_Addressbook.server.in.in
 
-serversdir = $(libdir)/bonobo/servers
-server_in_files = GNOME_Evolution_Addressbook.server.in
-servers_DATA = $(server_in_files:.server.in=.server)
+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@
 
 gladedir   = $(datadir)/evolution/glade
 glade_DATA = ldap-config.glade
@@ -84,7 +86,7 @@ etspec_DATA = addressbook-config.etspec
 
 EXTRA_DIST = 				\
 	$(glade_DATA)			\
-	$(servers_DATA)			\
+	$(server_DATA)			\
 	$(server_in_files)		\
 	$(etspec_DATA)
 
-- 
cgit