From 75f9b84b51c026a60b7581031c796e4e639c8f24 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 17 Dec 2005 10:01:12 +0000 Subject: Include libedataserver-$EDS_PACKAGE in the requirement list for E_WIDGETS. 2005-12-06 Tor Lillqvist * configure.in: Include libedataserver-$EDS_PACKAGE in the requirement list for E_WIDGETS. Set bindir_in_server_file, privlibexecdir_in_server_file and componentdir_in_server_file. On Unix, they are the same as bindir, privlibexecdir and componentdir respectively. On Win32, use paths relative from lib/bonobo/servers. AC_SUBST these variables. * server.mk: Substitute the values above new variables for the corresponding @..._IN_SERVER_FILE@ strings in the .server.in.in files. * addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in * calendar/gui/GNOME_Evolution_Calendar.server.in.in * calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in * mail/GNOME_Evolution_Mail.server.in.in * shell/GNOME_Evolution_Shell.server.in.in * shell/GNOME_Evolution_Test.server.in.in: Correspondingly, use the @..._IN_SERVER_FILE@ strings. svn path=/trunk/; revision=30793 --- server.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'server.mk') diff --git a/server.mk b/server.mk index f5152730d3..8c2b7cc2c4 100644 --- a/server.mk +++ b/server.mk @@ -1,8 +1,7 @@ %.server.in: %.server.in.in - sed -e 's|\@BINDIR\@|$(bindir)|' \ - -e 's|\@LIBEXECDIR\@|$(privlibexecdir)|' \ - -e 's|\@COMPONENTDIR\@|$(componentdir)|' \ - -e 's|\@IMPORTERSDIR\@|$(importersdir)|' \ + sed -e 's|\@BINDIR_IN_SERVER_FILE\@|$(bindir_in_server_file)|'\ + -e 's|\@PRIVLIBEXECDIR_IN_SERVER_FILE\@|$(privlibexecdir_in_server_file)|'\ + -e 's|\@COMPONENTDIR_IN_SERVER_FILE\@|$(componentdir_in_server_file)|'\ -e 's|\@VERSION\@|$(BASE_VERSION)|' \ -e 's|\@EXEEXT\@|$(EXEEXT)|' \ -e 's|\@SOEXT\@|$(SOEXT)|' \ -- cgit v1.2.3