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)

diff --git a/ChangeLog b/ChangeLog
index d5ef211..f9d92d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+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)
+
 2005-10-17  Ross Burton  <ross@burtonini.com>
 
        * configure.in:

diff --git a/configure.in b/configure.in
index 28fc198..42367f4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1241,7 +1241,7 @@ INTERFACE_VERSION="$BASE_VERSION"
 AC_SUBST(INTERFACE_VERSION)
 AC_DEFINE_UNQUOTED(INTERFACE_VERSION, "$INTERFACE_VERSION", [IDL interface version (Major.Minor)])
 
-EVO_SUBST_SERVER_RULE='%.server.in: %.server.in.in ; sed -e "s|\@BINDIR\@|$(bindir)|" -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@COMPONENTDIR\@|$(componentdir)|" -e "s|\@IMPORTERSDIR\@|$(importersdir)|" -e "s|\@EXEEXT\@|$(EXEEXT)|" -e "s|\@VERSION\@|$(BASE_VERSION)|" -e "s|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|" $< > $@'
+EVO_SUBST_SERVER_RULE='%.server.in: %.server.in.in ; sed -e "s|\@BINDIR\@|$(bindir)|" -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@COMPONENTDIR\@|$(componentdir)|" -e "s|\@IMPORTERSDIR\@|$(importersdir)|" -e "s|\@EXEEXT\@|$(EXEEXT)|" -e "s|\@VERSION\@|$(BASE_VERSION)|" -e "s|\@API_VERSION\@|$(API_VERSION)|" -e "s|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|" $< > $@'
 EVO_NAME_SERVER_RULE='%_$(API_VERSION).server: %.server ; mv $< $@'
 AC_SUBST(EVO_SUBST_SERVER_RULE)
 AC_SUBST(EVO_NAME_SERVER_RULE)

diff --git a/src/GNOME_Evolution_DataServer.server.in.in b/src/GNOME_Evolution_DataServer.server.in.in
index 109e130..1a90b98 100644 (file)
--- 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 57d8eee..b854e2b 100644 (file)
--- 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