[tracker] Define PKGLIBDIR instead of LIBDIR

[Jürg Billeter <juergbi src gnome org>]

commit dd7e6b4409907b20fd9b003c9abaa01db083a13c
Author: Jürg Billeter <j bitron ch>
Date:   Tue Mar 24 16:27:35 2009 +0100

    Define PKGLIBDIR instead of LIBDIR
    
    Prepare for versioned libdir
---
 src/tracker-indexer/Makefile.am                    |    2 +-
 src/tracker-indexer/modules/Makefile.am            |    1 -
 .../tracker-module-metadata-utils.c                |    3 +--
 src/trackerd/Makefile.am                           |    1 -
 tests/tracker-indexer/Makefile.am                  |    2 +-
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/tracker-indexer/Makefile.am b/src/tracker-indexer/Makefile.am
index 2f72f09..b54fad1 100644
--- a/src/tracker-indexer/Makefile.am
+++ b/src/tracker-indexer/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = modules
 INCLUDES =								\
 	-Wall								\
 	-DSHAREDIR=\""$(datadir)"\"					\
-	-DLIBDIR=\""$(libdir)"\"					\
+	-DPKGLIBDIR=\""$(libdir)/tracker"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DINDEXER_MODULES_DIR=\""$(libdir)/tracker/indexer-modules"\"	\
 	-DPUSH_MODULES_DIR=\""$(libdir)/tracker/push-modules/indexer"\" \
diff --git a/src/tracker-indexer/modules/Makefile.am b/src/tracker-indexer/modules/Makefile.am
index 18fbf4b..7b17eda 100644
--- a/src/tracker-indexer/modules/Makefile.am
+++ b/src/tracker-indexer/modules/Makefile.am
@@ -5,7 +5,6 @@ indexer_modulesdir = $(libdir)/tracker/indexer-modules
 
 INCLUDES =								\
 	-DSHAREDIR=\""$(datadir)"\"					\
-	-DLIBDIR=\""$(libdir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DINDEXER_MODULES_DIR=\"$(indexer_modulesdir)\"			\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
diff --git a/src/tracker-indexer/tracker-module-metadata-utils.c b/src/tracker-indexer/tracker-module-metadata-utils.c
index b830efd..52c5f2a 100644
--- a/src/tracker-indexer/tracker-module-metadata-utils.c
+++ b/src/tracker-indexer/tracker-module-metadata-utils.c
@@ -714,8 +714,7 @@ get_file_content_by_filter (GFile       *file,
 	str = g_strconcat (mime, "_filter", NULL);
 #endif
 
-	text_filter_file = g_build_filename (LIBDIR,
-					     "tracker",
+	text_filter_file = g_build_filename (PKGLIBDIR,
 					     "filters",
 					     str,
 					     NULL);
diff --git a/src/trackerd/Makefile.am b/src/trackerd/Makefile.am
index 6d5369c..01e8ab0 100644
--- a/src/trackerd/Makefile.am
+++ b/src/trackerd/Makefile.am
@@ -2,7 +2,6 @@ include $(top_srcdir)/Makefile.decl
 
 INCLUDES =								\
 	-DSHAREDIR=\""$(datadir)"\"					\
-	-DLIBDIR=\""$(libdir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DMAIL_MODULES_DIR=\""$(libdir)"/tracker/mail-modules\"         \
 	-DPUSH_MODULES_DIR=\""$(libdir)/tracker/push-modules/daemon"\"	\
diff --git a/tests/tracker-indexer/Makefile.am b/tests/tracker-indexer/Makefile.am
index 95a10cf..7c035ba 100644
--- a/tests/tracker-indexer/Makefile.am
+++ b/tests/tracker-indexer/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = 									\
 	-DTEST									\
 	-DG_LOG_DOMAIN=\"Tracker\"						\
 	-DINDEXER_MODULES_DIR=\""$(libdir)/tracker/indexer-modules"\"		\
-	-DLIBDIR=\""$(libdir)"\"						\
+	-DPKGLIBDIR=\""$(libdir)/tracker"\"					\
 	-DLIBEXEC_PATH=\""$(libexecdir)"\"					\
 	-DTRACKER_COMPILATION							\
 	-I$(top_srcdir)/src							\