diff options
| author | Irene Huang <Irene.Huang@sun.com> | 2005-10-24 06:24:17 +0000 |
|---|---|---|
| committer | Harry Lu <haip@src.gnome.org> | 2005-10-24 06:24:17 +0000 |
| commit | 4f6c13b5f71818fac019d3c1965fdaa9cb7381f9 (patch) | |
| tree | 27867181b63a6dd3af4ee0ef3442cf4ee5fa84ce /src | |
| parent | e07258699b279a47807e8f432ec9c3b844a2553f (diff) | |
| download | evolution-data-server-4f6c13b5f71818fac019d3c1965fdaa9cb7381f9.tar.gz | |
Add API_VERSION to EVO_SUBST_SERVER_RULE Change location of
2005-10-24 Irene Huang <Irene.Huang@sun.com>
* configure.in: Add API_VERSION to EVO_SUBST_SERVER_RULE
* src/GNOME_Evolution_DataServer.server.in.in: Change location
of OAFIID:GNOME_Evolution_DataServer_BookFactory:@VERSION@,
OAFIID:GNOME_Evolution_DataServer_CalFactory:@VERSION@,
OAFIID:GNOME_Evolution_DataServer_InterfaceCheck,
OAFIID:GNOME_Evolution_DataServer_Logging from
@LIBEXECDIR@/evolution-data-server-@VERSION@@EXEEXT@ to
@LIBEXECDIR@/evolution-data-server-@API_VERSION@/evolution-
data-server-@VERSION@@EXEEXT@.
* src/Makefile.am: In section install-evolution-data-servers:
change to $(mkinstalldirs) $(DESTDIR)$(libexecdir)/evolution-
data-server-$(API_VERSION)
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-data-server
$(DESTDIR)$(libexecdir)/evolution-data-server-$(API_VERSION)/
evolution-data-server-$(BASE_VERSION)
Diffstat (limited to 'src')
| -rw-r--r-- | src/GNOME_Evolution_DataServer.server.in.in | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/GNOME_Evolution_DataServer.server.in.in b/src/GNOME_Evolution_DataServer.server.in.in index 109e13071..1a90b98fc 100644 --- a/src/GNOME_Evolution_DataServer.server.in.in +++ b/src/GNOME_Evolution_DataServer.server.in.in @@ -2,7 +2,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_BookFactory:@VERSION@" type="exe" - location="@LIBEXECDIR@/evolution-data-server-@VERSION@@EXEEXT@"> + location="@LIBEXECDIR@/evolution-data-server-@API_VERSION@/evolution-data-server-@VERSION@@EXEEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/DataServer/BookFactory:@VERSION@"/> @@ -15,7 +15,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_CalFactory:@VERSION@" type="exe" - location="@LIBEXECDIR@/evolution-data-server-@VERSION@@EXEEXT@"> + location="@LIBEXECDIR@/evolution-data-server-@API_VERSION@/evolution-data-server-@VERSION@@EXEEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/DataServer/CalFactory:@VERSION@"/> @@ -28,7 +28,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_InterfaceCheck" type="exe" - location="@LIBEXECDIR@/evolution-data-server-@VERSION@@EXEEXT@"> + location="@LIBEXECDIR@/evolution-data-server-@API_VERSION@/evolution-data-server@VERSION@@EXEEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/ServerInterfaceCheck:1.0"/> @@ -40,7 +40,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_Logging" type="exe" - location="@LIBEXECDIR@/evolution-data-server-@VERSION@@EXEEXT@"> + location="@LIBEXECDIR@/evolution-data-server-@API_VERSION@/evolution-data-server-@VERSION@@EXEEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/ServerLogging:1.0"/> diff --git a/src/Makefile.am b/src/Makefile.am index 57d8eee09..b854e2bee 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -57,8 +57,8 @@ evolution_data_server_LDADD = \ $(E_FACTORY_LIBS) install-evolution-data-servers: - $(mkinstalldirs) $(DESTDIR)$(libexecdir) - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-data-server $(DESTDIR)$(libexecdir)/evolution-data-server-$(BASE_VERSION) + $(mkinstalldirs) $(DESTDIR)$(libexecdir)/evolution-data-server-$(API_VERSION) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-data-server $(DESTDIR)$(libexecdir)/evolution-data-server-$(API_VERSION)/evolution-data-server-$(BASE_VERSION) SERVER_IN_FILE=GNOME_Evolution_DataServer.server.in.in |