tracker r2639 - in trunk: . data

[mbiebl svn gnome org]

Author: mbiebl
Date: Wed Dec  3 06:00:40 2008
New Revision: 2639
URL: http://svn.gnome.org/viewvc/tracker?rev=2639&view=rev

Log:
Make sure, we correctly process trackerd.desktop so the translation stay intact

trackerd.desktop.in.in -> tracker.desktop.in : substitute VERSION and libexecdir
trackerd.desktop.in -> tracker.desktop : Include translations (intltool)


Modified:
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/data/trackerd.desktop.in.in

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Dec  3 06:00:40 2008
@@ -1155,7 +1155,6 @@
 	data/services/Makefile
 	data/tracker.pc
 	data/tracker-indexer-module-1.0.pc
-	data/trackerd.desktop.in
 	docs/Makefile
 	docs/design/Makefile
 	docs/manpages/Makefile

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Wed Dec  3 06:00:40 2008
@@ -2,8 +2,9 @@
 
 SUBDIRS = db dbus modules languages icons services
 
-trackerd.desktop: trackerd.desktop.in
-	@sed -e "s|@libexec[ ]|${libexecdir}|" $< > $@
+trackerd.desktop.in: trackerd.desktop.in.in
+	@sed -e "s|@libexecdir[ ]|${libexecdir}|" \
+	     -e "s|@VERSION[ ]|${VERSION}|" $< > $@
 
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = trackerd.desktop.in
@@ -22,4 +23,4 @@
 
 CLEANFILES = $(autostart_DATA)
 
-DISTCLEANFILES = $(autostart_in_files)
\ No newline at end of file
+DISTCLEANFILES = $(autostart_in_files)

Modified: trunk/data/trackerd.desktop.in.in
==============================================================================
--- trunk/data/trackerd.desktop.in.in	(original)
+++ trunk/data/trackerd.desktop.in.in	Wed Dec  3 06:00:40 2008
@@ -3,7 +3,7 @@
 _Name=Tracker
 _Comment=Tracker search and indexing service
 Icon=
-Exec= libexec@/trackerd
+Exec= libexecdir@/trackerd
 Terminal=false
 Type=Application
 Categories=