[tracker] Move tracker-fts.so from libdir to pkglibdir
- From: Jürg Billeter <juergbi src gnome org>
- To: svn-commits-list gnome org
- Subject: [tracker] Move tracker-fts.so from libdir to pkglibdir
- Date: Mon, 20 Apr 2009 09:30:05 -0400 (EDT)
commit 2aa5e2b4321e46f313775a2c430bf4d460972411
Author: Jürg Billeter <j bitron ch>
Date: Mon Apr 20 15:29:18 2009 +0200
Move tracker-fts.so from libdir to pkglibdir
---
src/libtracker-db/Makefile.am | 1 +
src/libtracker-db/tracker-db-interface-sqlite.c | 2 +-
src/tracker-fts/Makefile.am | 2 +-
utils/tracker-fts/Makefile.am | 1 +
utils/tracker-fts/tracker-fts-test.c | 2 +-
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/libtracker-db/Makefile.am b/src/libtracker-db/Makefile.am
index 14a32d4..02f2302 100644
--- a/src/libtracker-db/Makefile.am
+++ b/src/libtracker-db/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.decl
INCLUDES = \
-DSHAREDIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"Tracker\" \
+ -DPKGLIBDIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)"\" \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
diff --git a/src/libtracker-db/tracker-db-interface-sqlite.c b/src/libtracker-db/tracker-db-interface-sqlite.c
index 33a7d84..c9c1419 100644
--- a/src/libtracker-db/tracker-db-interface-sqlite.c
+++ b/src/libtracker-db/tracker-db-interface-sqlite.c
@@ -128,7 +128,7 @@ tracker_db_interface_sqlite_constructor (GType type,
#ifdef HAVE_SQLITE_FTS
sqlite3_enable_load_extension (priv->db, 1);
- sqlite3_load_extension (priv->db, "tracker-fts.so", NULL, &err_msg);
+ sqlite3_load_extension (priv->db, PKGLIBDIR "/tracker-fts.so", NULL, &err_msg);
if (err_msg) {
g_critical ("Could not load tracker-fts extension:'%s'", err_msg);
diff --git a/src/tracker-fts/Makefile.am b/src/tracker-fts/Makefile.am
index 2fa9948..4acebaa 100644
--- a/src/tracker-fts/Makefile.am
+++ b/src/tracker-fts/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = \
module_flags = -module -avoid-version -no-undefined
-tracker_fts_modulesdir = $(libdir)
+tracker_fts_modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
tracker_fts_modules_LTLIBRARIES = tracker-fts.la
tracker_fts_la_SOURCES = \
diff --git a/utils/tracker-fts/Makefile.am b/utils/tracker-fts/Makefile.am
index eb5efb0..920244e 100644
--- a/utils/tracker-fts/Makefile.am
+++ b/utils/tracker-fts/Makefile.am
@@ -4,6 +4,7 @@ noinst_PROGRAMS = tracker-fts-test
INCLUDES = \
-DG_LOG_DOMAIN=\"Tracker\" \
+ -DPKGLIBDIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)"\" \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS) \
diff --git a/utils/tracker-fts/tracker-fts-test.c b/utils/tracker-fts/tracker-fts-test.c
index d3d74ff..2ccf2e9 100644
--- a/utils/tracker-fts/tracker-fts-test.c
+++ b/utils/tracker-fts/tracker-fts-test.c
@@ -89,7 +89,7 @@ main (int argc, char **argv)
}
sqlite3_enable_load_extension (db, 1);
- sqlite3_load_extension (db, "tracker-fts.so", NULL, &st);
+ sqlite3_load_extension (db, PKGLIBDIR "/tracker-fts.so", NULL, &st);
if (st) {
fprintf(stderr, "SQL error: %s\n", st);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]