NetworkManager r4265 - in trunk: . initscript/Debian

[mbiebl svn gnome org]

Author: mbiebl
Date: Wed Nov  5 16:42:54 2008
New Revision: 4265
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4265&view=rev

Log:
Do not hard code the path to the NetworkManager binary

Added:
   trunk/initscript/Debian/NetworkManager.in
      - copied, changed from r4264, /trunk/initscript/Debian/NetworkManager
Removed:
   trunk/initscript/Debian/NetworkManager
Modified:
   trunk/configure.in
   trunk/initscript/Debian/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Nov  5 16:42:54 2008
@@ -500,6 +500,7 @@
 initscript/Gentoo/Makefile
 initscript/Gentoo/NetworkManager
 initscript/Debian/Makefile
+initscript/Debian/NetworkManager
 initscript/Slackware/Makefile
 initscript/Slackware/rc.networkmanager
 initscript/SUSE/Makefile

Modified: trunk/initscript/Debian/Makefile.am
==============================================================================
--- trunk/initscript/Debian/Makefile.am	(original)
+++ trunk/initscript/Debian/Makefile.am	Wed Nov  5 16:42:54 2008
@@ -1,4 +1,5 @@
-EXTRA_DIST = NetworkManager 
+EXTRA_DIST = NetworkManager.in
+DISTCLEANFILES = NetworkManager
 
 initddir = $(sysconfdir)/init.d
 initd_SCRIPTS = NetworkManager

Copied: trunk/initscript/Debian/NetworkManager.in (from r4264, /trunk/initscript/Debian/NetworkManager)
==============================================================================
--- /trunk/initscript/Debian/NetworkManager	(original)
+++ trunk/initscript/Debian/NetworkManager.in	Wed Nov  5 16:42:54 2008
@@ -8,22 +8,25 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: network connection manager
-# Description:       Daemon for automatically switching network 
+# Description:       Daemon for automatically switching network
 #		     connections to the best available connection.
 ### END INIT INFO
 
 set -e
 
+prefix= prefix@
+exec_prefix= prefix@
+sbindir= sbindir@
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DESC="network connection manager"
 NAME="NetworkManager"
 
-DAEMON=/usr/sbin/$NAME
+DAEMON=${sbindir}/$NAME
 
 PIDDIR=/var/run/NetworkManager
 PIDFILE=$PIDDIR/$NAME.pid
 
-SCRIPTNAME=/etc/init.d/network-manager
 USER=root
 
 # Gracefully exit if the package has been removed.
@@ -44,7 +47,7 @@
 
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
 		--oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE
-		
+
 }
 
 #
@@ -53,7 +56,7 @@
 d_stop() {
 	start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \
 		 --oknodo --user $USER --exec $DAEMON
-		 
+ 
 }
 
 
@@ -78,7 +81,7 @@
 	status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
 	;;
   *)
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
+	echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2
 	exit 1
 	;;
 esac