diff options
| author | Not Zed <NotZed@Ximian.com> | 2003-04-17 11:14:33 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2003-04-17 11:14:33 +0800 |
| commit | a79885a2e8d5b36950867b8fb8a6e8b54a9ded60 (patch) | |
| tree | 00717bafa40d24884ece3946eb83859f43a21a06 | |
| parent | 6b479c5f9f5c831748275b9d82ce4123d1fc7afd (diff) | |
| download | gsoc2013-evolution-a79885a2e8d5b36950867b8fb8a6e8b54a9ded60.tar.gz gsoc2013-evolution-a79885a2e8d5b36950867b8fb8a6e8b54a9ded60.tar.zst gsoc2013-evolution-a79885a2e8d5b36950867b8fb8a6e8b54a9ded60.zip | |
Remove COMPONENTDIR and set BINDIR and VERSION instead.
2003-04-16 Not Zed <NotZed@Ximian.com>
* importers/Makefile.am (%.server.in): Remove COMPONENTDIR and set
BINDIR and VERSION instead.
* (importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in,
importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in,
importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in,
importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in,
importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in:) : Convert the type back to exe, and point to the main evolution
executable. Fixes #41164.
svn path=/trunk/; revision=20875
7 files changed, 26 insertions, 12 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 4f27a8b437..e13c517b78 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,16 @@ +2003-04-16 Not Zed <NotZed@Ximian.com> + + * importers/Makefile.am (%.server.in): Remove COMPONENTDIR and set + BINDIR and VERSION instead. + + * (importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in, + importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in, + importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in, + importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in, + importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in:) : + Convert the type back to exe, and point to the main evolution + executable. Fixes #41164. + 2003-04-16 Jeremy Katz <katzj@redhat.com> * evolution-mail.schemas: schema keys can't be directories (#41419) diff --git a/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in index 59bba4bfee..7b2e60b8f2 100644 --- a/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in +++ b/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in @@ -1,8 +1,8 @@ <oaf_info> <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory" - type="shlib" - location="@COMPONENTDIR@/libevolution-mail.so"> + type="exe" + location="@BINDIR@/evolution-@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> diff --git a/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in index 61a1dd3b2f..5b2096d3ea 100644 --- a/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in +++ b/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in @@ -1,8 +1,8 @@ <oaf_info> <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory" - type="shlib" - location="@COMPONENTDIR@/libevolution-mail.so"> + type="exe" + location="@BINDIR@/evolution-@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> diff --git a/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in index 645ca0eb5b..795e441098 100644 --- a/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in +++ b/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in @@ -1,8 +1,8 @@ <oaf_info> <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory" - type="shlib" - location="@COMPONENTDIR@/libevolution-mail.so"> + type="exe" + location="@BINDIR@/evolution-@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> diff --git a/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in index 6af5ece4bc..1dc90779f8 100644 --- a/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in +++ b/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in @@ -1,8 +1,8 @@ <oaf_info> <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory" - type="shlib" - location="@COMPONENTDIR@/libevolution-mail.so"> + type="exe" + location="@BINDIR@/evolution-@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> diff --git a/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in index 808c8aa00f..5cdf7cbe35 100644 --- a/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in +++ b/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in @@ -1,8 +1,8 @@ <oaf_info> <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory" - type="shlib" - location="@COMPONENTDIR@/libevolution-mail.so"> + type="exe" + location="@BINDIR@/evolution-@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 380acbf13c..58cbfc898d 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -91,8 +91,9 @@ server_in_files = GNOME_Evolution_Mail_Mbox_Importer.server.in.in \ GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in server_DATA = $(server_in_files:.server.in.in=.server) %.server.in: %.server.in.in - sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@ - + sed -e "s|\@BINDIR\@|$(bindir)|" \ + -e "s|\@VERSION\@|$(BASE_VERSION)|" \ + $< > $@ EXTRA_DIST = $(server_in_files) $(server_DATA) |