network-manager-applet r538 - branches/network-manager-applet-0-6

[dcbw svn gnome org]

Author: dcbw
Date: Mon Feb 18 17:25:36 2008
New Revision: 538
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=538&view=rev

Log:
2008-02-18  Dan Williams  <dcbw redhat com>

	Patch from Michael Biebl <biebl debian org>

	* Makefile.am
		- nm-disconnect-wireless-on-exit.sh is a script, not data
		- Install the autostart file in the correct place since there's a spec
			for it now



Modified:
   branches/network-manager-applet-0-6/ChangeLog
   branches/network-manager-applet-0-6/Makefile.am

Modified: branches/network-manager-applet-0-6/Makefile.am
==============================================================================
--- branches/network-manager-applet-0-6/Makefile.am	(original)
+++ branches/network-manager-applet-0-6/Makefile.am	Mon Feb 18 17:25:36 2008
@@ -11,14 +11,14 @@
 dbusservice_DATA = nm-applet.conf
 
 toolsdir = $(datadir)/nm-applet
-tools_DATA = nm-disconnect-wireless-on-exit.sh
+tools_SCRIPTS = nm-disconnect-wireless-on-exit.sh
 
 EXTRA_DIST +=				\
 	$(dbusservice_DATA)		\
-	nm-applet.desktop		\
-	$(tools_DATA)
+	$(autostart_DATA)		\
+	$(tools_SCRIPTS)
 
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
-autostartdir = $(datadir)/gnome/autostart
+autostartdir = $(sysconfdir)/xdg/autostart
 autostart_DATA = nm-applet.desktop