tracker r2113 - in branches/indexer-split: . data data/dbus src/tracker-indexer src/trackerd

[carlosg svn gnome org]

Author: carlosg
Date: Wed Aug 20 13:33:13 2008
New Revision: 2113
URL: http://svn.gnome.org/viewvc/tracker?rev=2113&view=rev

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

        * src/trackerd/Makefile.am:
        * src/tracker-indexer/Makefile.am: Install both trackerd and
        tracker-indexer in $(prefix)/libexec, since they're not supposed to be
        executed by the user.
        * data/dbus/Makefile.am:
        * data/dbus/org.freedesktop.Tracker.service.in:
        * data/dbus/org.freedesktop.Tracker.Indexer.service.in: Look up the
        executables in $(libexecdir)
        * Makefile.am:
        * data/Makefile.am:
        * configure.ac:
        * trackerd.desktop.in.in: Moved trackerd.desktop.in.in to data/. Also
        correct path to trackerd.


Added:
   branches/indexer-split/data/trackerd.desktop.in.in
      - copied, changed from r2112, /branches/indexer-split/trackerd.desktop.in.in
Removed:
   branches/indexer-split/trackerd.desktop.in.in
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/Makefile.am
   branches/indexer-split/configure.ac
   branches/indexer-split/data/Makefile.am
   branches/indexer-split/data/dbus/Makefile.am
   branches/indexer-split/data/dbus/org.freedesktop.Tracker.Indexer.service.in
   branches/indexer-split/data/dbus/org.freedesktop.Tracker.service.in
   branches/indexer-split/src/tracker-indexer/Makefile.am
   branches/indexer-split/src/trackerd/Makefile.am

Modified: branches/indexer-split/Makefile.am
==============================================================================
--- branches/indexer-split/Makefile.am	(original)
+++ branches/indexer-split/Makefile.am	Wed Aug 20 13:33:13 2008
@@ -5,12 +5,6 @@
 SUBDIRS += tests
 endif
 
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = trackerd.desktop.in
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-
- INTLTOOL_DESKTOP_RULE@
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = tracker.pc
 

Modified: branches/indexer-split/configure.ac
==============================================================================
--- branches/indexer-split/configure.ac	(original)
+++ branches/indexer-split/configure.ac	Wed Aug 20 13:33:13 2008
@@ -846,6 +846,7 @@
 	data/Makefile
 	data/modules/Makefile
 	data/services/Makefile
+	data/trackerd.desktop.in
 	docs/Makefile
 	filters/application/Makefile
 	filters/Makefile
@@ -888,7 +889,6 @@
 	thumbnailers/application/Makefile
 	thumbnailers/image/Makefile
 	thumbnailers/Makefile
-	trackerd.desktop.in
 	tracker.pc
 	utils/Makefile
 	utils/qdbm/Makefile

Modified: branches/indexer-split/data/Makefile.am
==============================================================================
--- branches/indexer-split/data/Makefile.am	(original)
+++ branches/indexer-split/data/Makefile.am	Wed Aug 20 13:33:13 2008
@@ -1,5 +1,14 @@
 SUBDIRS = dbus modules languages icons services
 
+trackerd.desktop: trackerd.desktop.in
+	@sed -e "s|@libexec[ ]|${libexecdir}|" $< > $@
+
+autostartdir = $(sysconfdir)/xdg/autostart
+autostart_in_files = trackerd.desktop.in
+autostart_DATA = trackerd.desktop
+
+ INTLTOOL_DESKTOP_RULE@
+
 configdir = $(datadir)/tracker
 
 config_DATA =						\
@@ -16,4 +25,8 @@
 	sqlite-metadata.sql 				\
 	sqlite-xesam.sql
 
+CLEANFILES = $(autostart_DATA)
+
+DISTCLEANFILES = $(autostart_in_files)
+
 EXTRA_DIST = $(config_DATA)

Modified: branches/indexer-split/data/dbus/Makefile.am
==============================================================================
--- branches/indexer-split/data/dbus/Makefile.am	(original)
+++ branches/indexer-split/data/dbus/Makefile.am	Wed Aug 20 13:33:13 2008
@@ -17,7 +17,7 @@
 org.freedesktop.Tracker.Indexer_service_DATA = org.freedesktop.Tracker.Indexer.service
 
 %.service: %.service.in
-	@sed -e "s|\ bindir\@|$(bindir)|" $< > $@
+	@sed -e "s|@libexecdir[ ]|${libexecdir}|" $< > $@
 
 EXTRA_DIST = 						\
 	$(org.freedesktop.Tracker_service_DATA)		\

Modified: branches/indexer-split/data/dbus/org.freedesktop.Tracker.Indexer.service.in
==============================================================================
--- branches/indexer-split/data/dbus/org.freedesktop.Tracker.Indexer.service.in	(original)
+++ branches/indexer-split/data/dbus/org.freedesktop.Tracker.Indexer.service.in	Wed Aug 20 13:33:13 2008
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Tracker.Indexer
-Exec= bindir@/tracker-indexer
+Exec= libexecdir@/tracker-indexer

Modified: branches/indexer-split/data/dbus/org.freedesktop.Tracker.service.in
==============================================================================
--- branches/indexer-split/data/dbus/org.freedesktop.Tracker.service.in	(original)
+++ branches/indexer-split/data/dbus/org.freedesktop.Tracker.service.in	Wed Aug 20 13:33:13 2008
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Tracker
-Exec= bindir@/trackerd
+Exec= libexecdir@/trackerd

Copied: branches/indexer-split/data/trackerd.desktop.in.in (from r2112, /branches/indexer-split/trackerd.desktop.in.in)
==============================================================================
--- /branches/indexer-split/trackerd.desktop.in.in	(original)
+++ branches/indexer-split/data/trackerd.desktop.in.in	Wed Aug 20 13:33:13 2008
@@ -3,7 +3,7 @@
 _Name=Tracker
 _Comment=Tracker search and indexing service
 Icon=
-Exec=trackerd
+Exec= libexec@/trackerd
 Terminal=false
 Type=Application
 Categories=

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	Wed Aug 20 13:33:13 2008
@@ -11,7 +11,7 @@
 	$(DBUS_CFLAGS)							\
 	$(GMODULE_CFLAGS)
 
-bin_PROGRAMS = tracker-indexer
+libexec_PROGRAMS = tracker-indexer
 
 tracker_indexer_SOURCES =						\
 	tracker-dbus.c							\

Modified: branches/indexer-split/src/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/src/trackerd/Makefile.am	(original)
+++ branches/indexer-split/src/trackerd/Makefile.am	Wed Aug 20 13:33:13 2008
@@ -23,7 +23,7 @@
 #
 # Daemon sources
 #
-bin_PROGRAMS = trackerd
+libexec_PROGRAMS = trackerd
 
 trackerd_SOURCES =							\
 	tracker-crawler.c						\