tracker r2104 - in branches/indexer-split: . src/tracker-extract src/tracker-indexer

[carlosg svn gnome org]

Author: carlosg
Date: Tue Aug 19 15:55:31 2008
New Revision: 2104
URL: http://svn.gnome.org/viewvc/tracker?rev=2104&view=rev

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

        * src/tracker-extract/Makefile.am: Install tracker-extract in
        $prefix/libexec.
        * src/tracker-indexer/Makefile.am: specify tracker-extract path.
        * src/tracker-indexer/tracker-metadata-utils.c
        (create_metadata_context): Use defined tracker-extract path.


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

Modified: branches/indexer-split/src/tracker-extract/Makefile.am
==============================================================================
--- branches/indexer-split/src/tracker-extract/Makefile.am	(original)
+++ branches/indexer-split/src/tracker-extract/Makefile.am	Tue Aug 19 15:55:31 2008
@@ -134,7 +134,7 @@
 libextract_tiff_la_LDFLAGS = $(module_flags)
 libextract_tiff_la_LIBADD = $(GLIB2_LIBS) $(LIBTIFF_LIBS) $(EXEMPI_LIBS)
 
-bin_PROGRAMS = tracker-extract
+libexec_PROGRAMS = tracker-extract
 
 tracker_extract_SOURCES = \
 	tracker-extract.c			\

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	Tue Aug 19 15:55:31 2008
@@ -4,7 +4,8 @@
 	-DSHAREDIR=\""$(datadir)"\"					\
 	-DLIBDIR=\""$(libdir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-DINDEXER_MODULES_DIR=\""$(libdir)"/tracker/indexer-modules\"	\
+	-DINDEXER_MODULES_DIR=\""$(libdir)/tracker/indexer-modules"\"	\
+	-DEXTRACTOR_PATH=\""$(libexecdir)/tracker-extract"\"		\
 	-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	Tue Aug 19 15:55:31 2008
@@ -116,7 +116,7 @@
 create_metadata_context (void)
 {
 	GIOChannel *stdin_channel, *stdout_channel;
-	const gchar *argv[2] = { "tracker-extract", NULL };
+	const gchar *argv[2] = { EXTRACTOR_PATH, NULL };
 	GIOFlags flags;
 	GPid pid;