2 files changed, 29 insertions, 13 deletions
diff --git a/initscript/Debian/Makefile.am b/initscript/Debian/Makefile.am
index 89e6663..4165ad3 100644
--- a/initscript/Debian/Makefile.am
+++ b/initscript/Debian/Makefile.am
@@ -1,24 +1,40 @@
+# $Id$
 
-EXTRA_DIST=75avahi-daemon.in avahi-dnsconfd.in
-
-dbusinitddir = $(sysconfdir)/dbus-1/event.d
-dbusinitd_SCRIPTS = 75avahi-daemon
+# This file is part of avahi.
+#
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi 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 Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
 
 initddir = $(sysconfdir)/init.d
-initd_SCRIPTS = avahi-dnsconfd
 
-CLEANFILES=75avahi-daemon avahi-dnsconfd
+EXTRA_DIST = \
+	avahi-daemon.in \
+	avahi-dnsconfd.in
+
+initd_SCRIPTS = \
+	avahi-daemon \
+	avahi-dnsconfd
 
-75avahi-daemon: 75avahi-daemon.in
+CLEANFILES = \
+	avahi-daemon \
+	avahi-dnsconfd
+
+avahi-daemon: avahi-daemon.in
 	sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
 	chmod +x $@
 
 avahi-dnsconfd: avahi-dnsconfd.in
 	sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
 	chmod +x $@
-
-#if ENABLE_DBUS
-#install-data-local:
-#	$(LN_S) -f $(initddir)/avahi-daemon \
-#		$(sysconfdir)/dbus-1/event.d/75avahi-daemon
-#endif
diff --git a/initscript/Debian/75avahi-daemon.in b/initscript/Debian/avahi-daemon.in
index 26242b4..26242b4 100755
--- a/initscript/Debian/75avahi-daemon.in
+++ b/initscript/Debian/avahi-daemon.in