diff options
| author | Harish Krishnaswamy <kharish@novell.com> | 2005-11-29 04:51:43 +0000 |
|---|---|---|
| committer | Harish Krishnaswamy <kharish@src.gnome.org> | 2005-11-29 04:51:43 +0000 |
| commit | e16da7fc2901f087e7171e054a1999520166b00c (patch) | |
| tree | aa278844342b761d6985590dad8a5d9e3652525b | |
| parent | b7d8aead2e4f23ff0c34f4d168bd7be5c1e43461 (diff) | |
| download | evolution-data-server-e16da7fc2901f087e7171e054a1999520166b00c.tar.gz | |
Reverting the earlier changes to installable locations till we can test it
2005-11-29 Harish Krishnaswamy <kharish@novell.com>
* configure.in:
* src/GNOME_Evolution_DataServer.server.in.in:
* src/Makefile.am: Reverting the earlier changes to installable locations till we can test it better and
add the version-independent bonobo/help installables as well as was suggested in the list.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/GNOME_Evolution_DataServer.server.in.in | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
4 files changed, 15 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2005-11-29 Harish Krishnaswamy <kharish@novell.com> + + * configure.in: + * src/GNOME_Evolution_DataServer.server.in.in: + * src/Makefile.am: Reverting the changes to installable locations till we can test + it better and add the version-independent bonobo/help installables + as well as was suggested in the list. + 2005-11-28 Sushma Rai <rsushma@novell.com> * libedataserver/e-categories.c (initialize_categories_config): Add diff --git a/configure.in b/configure.in index 055c44f17..c07af72dc 100644 --- a/configure.in +++ b/configure.in @@ -1230,7 +1230,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|\@API_VERSION\@|$(API_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|\@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 1a90b98fc..109e13071 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-@API_VERSION@/evolution-data-server-@VERSION@@EXEEXT@"> + location="@LIBEXECDIR@/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-@API_VERSION@/evolution-data-server-@VERSION@@EXEEXT@"> + location="@LIBEXECDIR@/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-@API_VERSION@/evolution-data-server@VERSION@@EXEEXT@"> + location="@LIBEXECDIR@/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-@API_VERSION@/evolution-data-server-@VERSION@@EXEEXT@"> + location="@LIBEXECDIR@/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 c26b0782d..d7b146d55 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -57,8 +57,8 @@ evolution_data_server_LDADD = \ $(E_DATA_SERVER_LIBS) install-evolution-data-servers: - $(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) + $(mkinstalldirs) $(DESTDIR)$(libexecdir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-data-server $(DESTDIR)$(libexecdir)/evolution-data-server-$(BASE_VERSION) SERVER_IN_FILE=GNOME_Evolution_DataServer.server.in.in |