[network-manager-netbook/MplPanelClient] Use the correct path in autostart file.

[Tambet Ingo <tambeti src gnome org>]

commit f0e6cffc4b55cf83766e4215828ca58d9cdb9632
Author: Tambet Ingo <tambet gmail com>
Date:   Wed Dec 2 12:19:21 2009 +0200

    Use the correct path in autostart file.

 .gitignore                                         |    1 +
 Makefile.am                                        |   10 +++++++---
 ...k.desktop => network-manager-netbook.desktop.in |    2 +-
 po/POTFILES.in                                     |    1 +
 4 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7259568..00bb489 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ libtool
 ltmain.sh
 missing
 network-manager-netbook.css
+network-manager-netbook.desktop
 org.moblin.UX.Shell.Panels.network.service
 stamp-*
 TAGS
diff --git a/Makefile.am b/Makefile.am
index 521009a..1d7321d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,12 @@
 SUBDIRS = icons marshallers libnm-gtk src po
 
 autostartdir = $(sysconfdir)/xdg/autostart
+autostart_in_files = network-manager-netbook.desktop.in
 autostart_DATA = network-manager-netbook.desktop
 
+%.desktop: %.desktop.in
+	$(AM_V_GEN) sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
+
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.moblin.UX.Shell.Panels.network.service.in
 service_DATA = org.moblin.UX.Shell.Panels.network.service
@@ -18,7 +22,7 @@ theme_DATA = network-manager-netbook.css
 	$(AM_V_GEN) sed -e "s|\ pkgdatadir\@|$(pkgdatadir)|" $< > $@
 
 EXTRA_DIST = \
-	$(autostart_DATA) \
+	$(autostart_in_files) \
 	$(service_in_files) \
 	$(theme_in_files) \
 	intltool-extract.in \
@@ -26,9 +30,9 @@ EXTRA_DIST = \
 	intltool-update.in
 
 DISTCLEANFILES = \
+	$(autostart_DATA) \
 	$(service_DATA) \
 	$(theme_DATA) \
 	intltool-extract \
 	intltool-merge \
-	intltool-update \
-	network-manager-netbook.css
+	intltool-update
diff --git a/network-manager-netbook.desktop b/network-manager-netbook.desktop.in
similarity index 80%
rename from network-manager-netbook.desktop
rename to network-manager-netbook.desktop.in
index dec649d..76fb3eb 100644
--- a/network-manager-netbook.desktop
+++ b/network-manager-netbook.desktop.in
@@ -2,7 +2,7 @@
 _Name=network-manager-netbook
 _Comment=Control your network connections
 Icon=nm-device-wireless
-Exec=network-manager-netbook
+Exec= libexecdir@/network-manager-netbook
 Terminal=false
 Type=Application
 X-GNOME-Autostart-enabled=true
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ad5126d..db07d9c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+network-manager-netbook.desktop.in
 libnm-gtk/nm-ethernet-item.c
 libnm-gtk/nm-wifi-item.c
 libnm-gtk/nm-gsm-item.c