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

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 5809eb7b0199c637bf7d6afab7f5ec00c5424e67..78d518729b31f52290d1e052bd7aa834f1e3975f 100644 (file)
--- 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 (file)
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 (file)
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