tracker r2178 - in branches/indexer-split: . src/tracker-indexer src/tracker-thumbnailer tests/tracker-indexer

[carlosg svn gnome org]

Author: carlosg
Date: Thu Aug 28 10:22:55 2008
New Revision: 2178
URL: http://svn.gnome.org/viewvc/tracker?rev=2178&view=rev

Log:
2008-08-28  Carlos Garnacho  <carlos imendio com>

        * src/tracker-thumbnailer/Makefile.am: Install thumbnailer in libexec.
        * src/tracker-indexer/Makefile.am:
        * tests/tracker-indexer/Makefile.am: define LIBEXECDIR
        * src/tracker-indexer/tracker-metadata-utils.c
        (tracker_metadata_query_file) (tracker_metadata_utils_get_thumbnail):
        Use LIBEXECDIR to locate both tracker-extract and tracker-thumbnailer.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/tracker-indexer/Makefile.am
   branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c
   branches/indexer-split/src/tracker-thumbnailer/Makefile.am
   branches/indexer-split/tests/tracker-indexer/Makefile.am

Modified: branches/indexer-split/src/tracker-indexer/Makefile.am
==============================================================================
--- branches/indexer-split/src/tracker-indexer/Makefile.am	(original)
+++ branches/indexer-split/src/tracker-indexer/Makefile.am	Thu Aug 28 10:22:55 2008
@@ -5,7 +5,7 @@
 	-DLIBDIR=\""$(libdir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DINDEXER_MODULES_DIR=\""$(libdir)/tracker/indexer-modules"\"	\
-	-DEXTRACTOR_PATH=\""$(libexecdir)/tracker-extract"\"		\
+	-DLIBEXEC_PATH=\""$(libexecdir)"\"				\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-I$(top_srcdir)/src						\
 	$(DBUS_CFLAGS)							\

Modified: branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c	Thu Aug 28 10:22:55 2008
@@ -156,7 +156,7 @@
 tracker_metadata_query_file (const gchar *path,
 			     const gchar *mimetype)
 {
-	const gchar *argv[2] = { EXTRACTOR_PATH, NULL };
+	const gchar *argv[2] = { LIBEXEC_PATH G_DIR_SEPARATOR_S "tracker-extract", NULL };
 	gchar *utf_path, *str;
 	GPtrArray *array;
 	GIOStatus status;
@@ -522,7 +522,7 @@
 	GString *thumbnail;
 	gchar *argv[5];
 
-	argv[0] = g_strdup ("tracker-thumbnailer");
+	argv[0] = g_strdup (LIBEXEC_PATH G_DIR_SEPARATOR_S "tracker-thumbnailer");
 	argv[1] = g_filename_from_utf8 (path, -1, NULL, NULL, NULL);
 	argv[2] = g_strdup (mime);
 	argv[3] = g_strdup ("normal");

Modified: branches/indexer-split/src/tracker-thumbnailer/Makefile.am
==============================================================================
--- branches/indexer-split/src/tracker-thumbnailer/Makefile.am	(original)
+++ branches/indexer-split/src/tracker-thumbnailer/Makefile.am	Thu Aug 28 10:22:55 2008
@@ -3,7 +3,7 @@
 	$(LIBPNG_CFLAGS) \
 	-DLIBDIR=\""$(libdir)"\" 
 
-bin_PROGRAMS = tracker-thumbnailer
+libexec_PROGRAMS = tracker-thumbnailer
 
 tracker_thumbnailer_SOURCES = \
 	tracker-thumbnailer.c \

Modified: branches/indexer-split/tests/tracker-indexer/Makefile.am
==============================================================================
--- branches/indexer-split/tests/tracker-indexer/Makefile.am	(original)
+++ branches/indexer-split/tests/tracker-indexer/Makefile.am	Thu Aug 28 10:22:55 2008
@@ -8,7 +8,7 @@
 	-g 				\
 	-DG_LOG_DOMAIN=\"Tracker\"	\
 	-DLIBDIR=\""$(libdir)"\"	\
-	-DEXTRACTOR_PATH=\""$(libexecdir)/tracker-extract"\" \
+	-DLIBEXEC_PATH=\""$(libexecdir)"\"	\
 	-I$(top_srcdir)/src		\
 	-I$(top_srcdir)/tests/common	\
 	$(GMODULE_CFLAGS)		\