From 707e763398063186c20d8aba3abdef20e3d39253 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 8 Aug 2005 19:24:36 +0000
Subject: put real path to avahi-discover into .desktop file

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@280 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 avahi-utils/Makefile.am               |  6 +++++-
 avahi-utils/avahi-discover.desktop    | 10 ----------
 avahi-utils/avahi-discover.desktop.in | 10 ++++++++++
 3 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 avahi-utils/avahi-discover.desktop
 create mode 100644 avahi-utils/avahi-discover.desktop.in

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 5809eb7..78d5187 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = \
 	avahi-bookmarks.in \
 	avahi-resolve-host-name.in \
 	avahi-resolve-address.in \
-	avahi-discover.desktop
+	avahi-discover.desktop.in
 
 if HAVE_PYTHON
 SUBDIRS=avahi
@@ -45,6 +45,10 @@ desktop_DATA = avahi-discover.desktop
 bin_SCRIPTS = $(pythonscripts)
 endif
 
+avahi-discover.desktop: avahi-discover.desktop.in
+	sed -e 's,@bindir\@,$(bindir),g' $< > $@
+	chmod +x $@
+
 avahi-publish-address: avahi-publish-address.in
 	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
 	chmod +x $@
diff --git a/avahi-utils/avahi-discover.desktop b/avahi-utils/avahi-discover.desktop
deleted file mode 100644
index da4fa8b..0000000
--- a/avahi-utils/avahi-discover.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Avahi Zeroconf Browser
-Comment=Browse for Zeroconf services available on your network
-Exec=avahi-discover
-Terminal=false
-Type=Application
-Icon=gnome-nettool.png
-Categories=GNOME;Application;System;Utility
-StartupNotify=false
diff --git a/avahi-utils/avahi-discover.desktop.in b/avahi-utils/avahi-discover.desktop.in
new file mode 100644
index 0000000..2362cd4
--- /dev/null
+++ b/avahi-utils/avahi-discover.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Avahi Zeroconf Browser
+Comment=Browse for Zeroconf services available on your network
+Exec=@bindir@/avahi-discover
+Terminal=false
+Type=Application
+Icon=gnome-nettool.png
+Categories=GNOME;Application;System;Utility
+StartupNotify=false
-- 
cgit