diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-12-17 18:01:12 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-12-17 18:01:12 +0800 |
| commit | 75f9b84b51c026a60b7581031c796e4e639c8f24 (patch) | |
| tree | a97a325baa0f9eef4b6f2a2b4329a798afd71c92 /shell | |
| parent | 9963a2fcff96649aa4270162ba6c885ce3693c52 (diff) | |
| download | gsoc2013-evolution-75f9b84b51c026a60b7581031c796e4e639c8f24.tar.gz 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 'shell')
| -rw-r--r-- | shell/GNOME_Evolution_Shell.server.in.in | 4 | ||||
| -rw-r--r-- | shell/GNOME_Evolution_Test.server.in.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/shell/GNOME_Evolution_Shell.server.in.in b/shell/GNOME_Evolution_Shell.server.in.in index a4543dd25b..596c312e10 100644 --- a/shell/GNOME_Evolution_Shell.server.in.in +++ b/shell/GNOME_Evolution_Shell.server.in.in @@ -2,7 +2,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Shell:@VERSION@" type="exe" - location="@BINDIR@/evolution-@VERSION@@EXEEXT@"> + location="@BINDIR_IN_SERVER_FILE@/evolution-@VERSION@@EXEEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/Shell:@VERSION@"/> @@ -14,7 +14,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_Factory:@VERSION@" type="exe" - location="@BINDIR@/evolution-@VERSION@"> + location="@BINDIR_IN_SERVER_FILE@/evolution-@VERSION@@EXEEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/GenericFactory:1.0"/> diff --git a/shell/GNOME_Evolution_Test.server.in.in b/shell/GNOME_Evolution_Test.server.in.in index 24789ea089..ef0db8b1ac 100644 --- a/shell/GNOME_Evolution_Test.server.in.in +++ b/shell/GNOME_Evolution_Test.server.in.in @@ -3,7 +3,7 @@ <!-- (factory) --> <oaf_server iid="OAFIID:GNOME_Evolution_Test_Factory:@VERSION@" type="shlib" - location="@COMPONENTDIR@/libevolution-test@SOEXT@"> + location="@COMPONENTDIR_IN_SERVER_FILE@/libevolution-test@SOEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> |