aboutsummaryrefslogtreecommitdiffstats
path: root/server.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-12-17 18:01:12 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-12-17 18:01:12 +0800
commit75f9b84b51c026a60b7581031c796e4e639c8f24 (patch)
treea97a325baa0f9eef4b6f2a2b4329a798afd71c92 /server.mk
parent9963a2fcff96649aa4270162ba6c885ce3693c52 (diff)
downloadgsoc2013-evolution-75f9b84b51c026a60b7581031c796e4e639c8f24.tar
gsoc2013-evolution-75f9b84b51c026a60b7581031c796e4e639c8f24.tar.gz
gsoc2013-evolution-75f9b84b51c026a60b7581031c796e4e639c8f24.tar.bz2
gsoc2013-evolution-75f9b84b51c026a60b7581031c796e4e639c8f24.tar.lz
gsoc2013-evolution-75f9b84b51c026a60b7581031c796e4e639c8f24.tar.xz
gsoc2013-evolution-75f9b84b51c026a60b7581031c796e4e639c8f24.tar.zst
gsoc2013-evolution-75f9b84b51c026a60b7581031c796e4e639c8f24.zip
Include libedataserver-$EDS_PACKAGE in the requirement list for E_WIDGETS.
2005-12-06 Tor Lillqvist <tml@novell.com> * 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
Diffstat (limited to 'server.mk')
-rw-r--r--server.mk7
1 files changed, 3 insertions, 4 deletions
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)|' \