1 --- evolution-data-server-2.22.0/src/Makefile.am 2005-12-08 15:54:23.000000000 +0800 2 +++ evolution-data-server-2.22.0/src/Makefile.am 2005-12-22 10:23:59.747081000 +0800 3 @@ -63,8 +63,8 @@ 4 $(E_DATA_SERVER_LIBS) 5 6 install-evolution-data-servers: 7 - $(mkinstalldirs) $(DESTDIR)$(libexecdir) 8 - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-data-server $(DESTDIR)$(libexecdir)/evolution-data-server-$(BASE_VERSION) 9 + $(mkinstalldirs) $(DESTDIR)$(libexecdir)/evolution-data-server-$(API_VERSION) 10 + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-data-server $(DESTDIR)$(libexecdir)/evolution-data-server-$(API_VERSION)/evolution-data-server-$(BASE_VERSION) 11 12 SERVER_IN_FILE=GNOME_Evolution_DataServer.server.in.in 13 14 --- evolution-data-server-1.4.1.1/src/GNOME_Evolution_DataServer.server.in.in.orig 2006-10-10 13:17:44.021053000 +0800 15 +++ evolution-data-server-1.4.1.1/src/GNOME_Evolution_DataServer.server.in.in 2006-10-10 13:17:57.220608000 +0800 16 @@ -2,7 +2,7 @@ 17 18 <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_BookFactory:@API_VERSION@" 19 type="exe" 20 - location="@LIBEXECDIR_IN_SERVER_FILE@/evolution-data-server-@VERSION@@EXEEXT@"> 21 + location="@LIBEXECDIR_IN_SERVER_FILE@/evolution-data-server-@API_VERSION@/evolution-data-server-@VERSION@@EXEEXT@"> 22 23 <oaf_attribute name="repo_ids" type="stringv"> 24 <item value="IDL:GNOME/Evolution/DataServer/BookFactory:@API_VERSION@"/> 25 @@ -15,7 +15,7 @@ 26 27 <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_CalFactory:@API_VERSION@" 28 type="exe" 29 - location="@LIBEXECDIR_IN_SERVER_FILE@/evolution-data-server-@VERSION@@EXEEXT@"> 30 + location="@LIBEXECDIR_IN_SERVER_FILE@/evolution-data-server-@API_VERSION@/evolution-data-server-@VERSION@@EXEEXT@"> 31 32 <oaf_attribute name="repo_ids" type="stringv"> 33 <item value="IDL:GNOME/Evolution/DataServer/CalFactory:@API_VERSION@"/> 34 @@ -28,7 +28,7 @@ 35 36 <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_InterfaceCheck" 37 type="exe" 38 - location="@LIBEXECDIR_IN_SERVER_FILE@/evolution-data-server-@VERSION@@EXEEXT@"> 39 + location="@LIBEXECDIR_IN_SERVER_FILE@/evolution-data-server-@API_VERSION@/evolution-data-server-@VERSION@@EXEEXT@"> 40 41 <oaf_attribute name="repo_ids" type="stringv"> 42 <item value="IDL:GNOME/Evolution/ServerInterfaceCheck:1.0"/> 43 @@ -40,7 +40,7 @@ 44 45 <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_Logging" 46 type="exe" 47 - location="@LIBEXECDIR_IN_SERVER_FILE@/evolution-data-server-@VERSION@@EXEEXT@"> 48 + location="@LIBEXECDIR_IN_SERVER_FILE@/evolution-data-server-@API_VERSION@/evolution-data-server-@VERSION@@EXEEXT@"> 49 50 <oaf_attribute name="repo_ids" type="stringv"> 51 <item value="IDL:GNOME/Evolution/ServerLogging:1.0"/> 52