build fixes

remove fprintfs


git-svn-id: file:///home/lennart/svn/public/aeswepd/trunk@5 022f378f-78c4-0310-b860-d162c87e6274

4 files changed, 14 insertions, 45 deletions

diff --git a/conf/Makefile.am b/conf/Makefile.am
index e5b252f..2e6973c 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -16,27 +16,31 @@
 # along with waproamd; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-SUBDIRS = scripts
-
 if BUILD_WAPROAMD
 
-noinst_DATA = waproamd.init waproamd.conf
+noinst_DATA = waproamd.init waproamd.conf default
 
-EXTRA_DIST = waproamd.init.in waproamd.conf
+EXTRA_DIST = waproamd.init.in waproamd.conf default.in
 
-CLEANFILES = waproamd.init
+CLEANFILES = waproamd.init default
 
 waproamd.init: waproamd.init.in Makefile
 	sed -e 's,@sysconfdir\@,$(sysconfdir),g' -e 's,@sbindir\@,$(sbindir),g' $< > $@
 	chmod 755 $@
 
+default: default.in Makefile
+	sed -e 's,@sysconfdir\@,$(sysconfdir),g' -e 's,@sbindir\@,$(sbindir),g' $< > $@
+	chmod 755 $@
+
 install-data-local: waproamd.init
-	$(INSTALL) -D -m755 waproamd.init ${DESTDIR}/${sysconfdir}/init.d/waproamd
-	$(INSTALL) -D -m644 $(srcdir)/waproamd.conf ${DESTDIR}/${sysconfdir}/waproamd/waproamd.conf
+	$(INSTALL) -b -D -m755 waproamd.init ${DESTDIR}/${sysconfdir}/init.d/waproamd
+	$(INSTALL) -b -D -m644 $(srcdir)/waproamd.conf ${DESTDIR}/${sysconfdir}/waproamd/waproamd.conf
 	mkdir -p ${DESTDIR}/${sysconfdir}/waproamd/keys
+	$(INSTALL) -D -m755 default ${DESTDIR}/${sysconfdir}/waproamd/scripts/default
 
 uninstall-local:
 	rmdir ${DESTDIR}/${sysconfdir}/waproamd/keys
 	rm -f ${DESTDIR}/${sysconfdir}/init.d/waproamd ${DESTDIR}/${sysconfdir}/waproamd/waproamd.conf
+	rm -f ${DESTDIR}/${sysconfdir}/waproamd/scripts/default
 
 endif
diff --git a/conf/scripts/default.in b/conf/default.in
index 02bdca4..02bdca4 100755
--- a/conf/scripts/default.in
+++ b/conf/default.in
diff --git a/conf/scripts/Makefile.am b/conf/scripts/Makefile.am
deleted file mode 100644
index 97a94d3..0000000
--- a/conf/scripts/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id$
-
-# This file is part of waproamd.
-#
-# waproamd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# waproamd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with waproamd; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-if BUILD_WAPROAMD
-
-noinst_DATA = default
-
-EXTRA_DIST = default.in
-
-CLEANFILES = default
-
-default: default.in Makefile
-	sed -e 's,@sysconfdir\@,$(sysconfdir),g' -e 's,@sbindir\@,$(sbindir),g' $< > $@
-	chmod 755 $@
-
-install-data-local: default
-	$(INSTALL) -D -m755 default ${DESTDIR}/${sysconfdir}/waproamd/scripts/default
-
-uninstall-local: 
-	rm -f ${DESTDIR}/${sysconfdir}/waproamd/scripts/default
-
-endif
diff --git a/conf/waproamd.init.in b/conf/waproamd.init.in
index 891cd24..467ce9a 100755
--- a/conf/waproamd.init.in
+++ b/conf/waproamd.init.in
@@ -33,7 +33,9 @@ case "$1" in
     start)
         echo -n "Starting Wireless Access Point Roaming Daemon:"
         for IF in $INTERFACES ; do
-            $WAPROAMD -i $IF $ARGS
+            A="`eval echo \$\{ARGS_${IF}\}`"
+            [ -z "$A" ] && A="$ARGS"
+            $WAPROAMD -i $IF $A
             echo -n " $IF"
         done
         echo "."