Index: src/libtracker/Makefile.am
===================================================================
--- src/libtracker/Makefile.am	(revision 540)
+++ src/libtracker/Makefile.am	(working copy)
@@ -1,5 +1,5 @@
 INCLUDES =				\
-	-DDATADIR=\""$(datadir)"\"	\
+	-DTRACKERDATADIR=\""$(datadir)"\"	\
 	$(GLIB2_CFLAGS)			\
 	$(DBUS_CFLAGS)			
 
Index: src/trackerd/Makefile.am
===================================================================
--- src/trackerd/Makefile.am	(revision 540)
+++ src/trackerd/Makefile.am	(working copy)
@@ -1,5 +1,5 @@
 INCLUDES =				\
-	-DDATADIR=\""$(datadir)"\"	\
+	-DTRACKERDATADIR=\""$(datadir)"\"	\
 	-DLIBDIR=\""$(libdir)"\"	\
 	-D_XOPEN_SOURCE_EXTENDED=1	\
 	-D_GNU_SOURCE=1			\
Index: src/trackerd/tracker-db-sqlite.c
===================================================================
--- src/trackerd/tracker-db-sqlite.c	(revision 540)
+++ src/trackerd/tracker-db-sqlite.c	(working copy)
@@ -223,7 +223,7 @@
 {
 	char *filename, *query;
 	
-	filename = g_build_filename (DATADIR, "/tracker/", sql_file, NULL);
+	filename = g_build_filename (TRACKERDATADIR, "/tracker/", sql_file, NULL);
 
 	if (!g_file_get_contents (filename, &query, NULL, NULL)) {
 		tracker_log ("Tracker cannot read required file %s - Please reinstall tracker or check read permissions on the file if it exists", sql_file);
@@ -419,7 +419,7 @@
 
 	tracker_log ("Loading prepared queries...");
 
-	sql_file = g_strdup (DATADIR "/tracker/sqlite-stored-procs.sql");
+	sql_file = g_strdup (TRACKERDATADIR "/tracker/sqlite-stored-procs.sql");
 
 	if (!g_file_test (sql_file, G_FILE_TEST_EXISTS)) {
 		tracker_log ("Tracker cannot read required file %s - Please reinstall tracker or check read permissions on the file if it exists", sql_file);
@@ -1493,7 +1497,7 @@
 
 		i++;
 
-		sql_file = g_strconcat (DATADIR, "/tracker/tracker-db-table-update", version, ".sql", NULL);
+		sql_file = g_strconcat (TRACKERDATADIR, "/tracker/tracker-db-table-update", version, ".sql", NULL);
 
 		tracker_log ("Please wait while database is being updated to the latest version");
 
Index: src/trackerd/tracker-utils.c
===================================================================
--- src/trackerd/tracker-utils.c	(revision 540)
+++ src/trackerd/tracker-utils.c	(working copy)
@@ -1869,7 +1889,7 @@
 	char *stopword_path, *stopword_file;
 	char *stopwords;
 
-	stopword_path = g_build_filename (DATADIR, "tracker", "languages", "stopwords", NULL);
+	stopword_path = g_build_filename (TRACKERDATADIR, "tracker", "languages", "stopwords", NULL);
 	stopword_file = g_strconcat (stopword_path, ".", language, NULL);
 	g_free (stopword_path);