distcheck works now

build fixes


git-svn-id: file:///home/lennart/svn/public/ifplugd/trunk@31 2bf48fe7-cfc1-0310-909f-d9042e1e0fef

3 files changed, 28 insertions, 17 deletions

diff --git a/conf/Makefile.am b/conf/Makefile.am
index e873a24..743aa41 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -27,6 +27,9 @@ ifplugd.init: ifplugd.init.in Makefile
 	chmod 755 $@
 
 install-data-local: ifplugd.init
-	$(INSTALL) -D -m755 ifplugd.init ${DESTDIR}/${sysconfdir}/init.d/ifplugd
-	$(INSTALL) -D -m755 ifplugd.action ${DESTDIR}/${sysconfdir}/ifplugd/ifplugd.action
-	$(INSTALL) -D -m644 ifplugd.conf ${DESTDIR}/${sysconfdir}/ifplugd/ifplugd.conf
+	$(INSTALL) -b -D -m755 ifplugd.init ${DESTDIR}/${sysconfdir}/init.d/ifplugd
+	$(INSTALL) -b -D -m755 $(srcdir)/ifplugd.action ${DESTDIR}/${sysconfdir}/ifplugd/ifplugd.action
+	$(INSTALL) -b -D -m644 $(srcdir)/ifplugd.conf ${DESTDIR}/${sysconfdir}/ifplugd/ifplugd.conf
+
+uninstall-local:
+	rm -f ${DESTDIR}/${sysconfdir}/ifplugd/ifplugd.action ${DESTDIR}/${sysconfdir}/ifplugd/ifplugd.conf ${DESTDIR}/${sysconfdir}/init.d/ifplugd
diff --git a/conf/ifplugd.conf b/conf/ifplugd.conf
index 7e53334..1787dd1 100644
--- a/conf/ifplugd.conf
+++ b/conf/ifplugd.conf
@@ -19,18 +19,24 @@
 
 # ifplugd configuration file
 
+# Please note that this is a bourne shell fragment sourced by the
+# init script of ifplugd.
+
 # Specify the interfaces to control here, separated by spaces.
-# Ifplugd processes will be started for each of these interfaces
-# when the ifplugd init script is called with the "start" argument.
-# You may use the magic string "auto" to make the init script
-# start or stop ifplugd processes for ALL eth and wlan interfaces
-# that are available according to /proc/net/dev.  Note that the
-# list of interfaces appearing in /proc/net/dev may depend on
-# which kernel modules you have loaded.
+# Ifplugd processes will be started for each of these interfaces when
+# the ifplugd init script is called with the "start" argument. You may
+# use the magic string "auto" to make the init script start or stop
+# ifplugd processes for ALL eth and wlan interfaces that are available
+# according to /proc/net/dev. Note that the list of interfaces
+# appearing in /proc/net/dev may depend on which kernel modules you
+# have loaded.
 INTERFACES="eth0"
 
 # Additional parameters for ifplugd.
 # (Run "ifplugd -h" for further information.)
 ARGS="-fwI -u0 -d10"
 
-ARGS_wlan0="-MwI -u5 -d5"
+# Additional parameters for ifplugd for the specified interface.  Note
+# that $ARGS is ignored, when a variable like this is set for an
+# interface
+#ARGS_wlan0="-MwI -u5 -d5"
diff --git a/conf/ifplugd.init.in b/conf/ifplugd.init.in
index 89ebdc6..f28274c 100755
--- a/conf/ifplugd.init.in
+++ b/conf/ifplugd.init.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # $Id: ifplugd.init 1.6 Sat, 01 Feb 2003 03:00:07 +0100 lennart $
 
 # This file is part of ifplugd.
@@ -59,15 +59,17 @@ fi
 
 case "$1" in
     start)
-        echo -n "Starting ethernet plugging daemon:"
+        echo -n "Starting Network Interface Plugging Daemon:"
         for IF in $INTERFACES ; do
-            $IFPLUGD -i $IF $ARGS
+            A="`eval echo \$\{ARGS_${IF}\}`"
+            [ -z "$A" ] && A="$ARGS"
+            $IFPLUGD -i $IF $A
             echo -n " $IF"
         done
         echo "."
         ;;
     stop)
-        echo -n "Stopping ethernet plugging daemon:"
+        echo -n "Stopping Network Interface Plugging Daemon:"
         for IF in $INTERFACES ; do 
             $IFPLUGD -k -i $IF
             echo -n " $IF"
@@ -80,7 +82,7 @@ case "$1" in
         done
         ;;
     suspend)
-        echo -n "Suspending ethernet plugging daemon:"
+        echo -n "Suspending Network Interface Plugging Daemon:"
         for IF in $INTERFACES ; do
             $IFPLUGD -S -i $IF
             echo -n " $IF"
@@ -88,7 +90,7 @@ case "$1" in
         echo "."    
         ;;
     resume)
-        echo -n "Resuming ethernet plugging daemon:"
+        echo -n "Resuming Network Interface Plugging Daemon:"
         for IF in $INTERFACES ; do
             $IFPLUGD -R -i $IF
             echo -n " $IF"