summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--avahi-daemon/Makefile.am3
-rw-r--r--avahi-dnsconfd/Makefile.am2
-rwxr-xr-xinitscript/Debian/75avahi-daemon.in (renamed from initscript/Debian/75avahi-daemon)2
-rw-r--r--initscript/Debian/Makefile.am13
-rwxr-xr-xinitscript/Debian/avahi-dnsconfd.in (renamed from initscript/Debian/avahi-dnsconfd)2
5 files changed, 18 insertions, 4 deletions
diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index a1b2dcb..ed231a6 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -46,7 +46,7 @@ endif
# This cool debug trap works on i386/gcc only
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
-bin_PROGRAMS = \
+sbin_PROGRAMS = \
avahi-daemon
avahi_daemon_SOURCES = \
@@ -79,3 +79,4 @@ avahi_daemon_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/
xmllint:
xmllint --noout --valid example.service
+ xmllint --noout --valid Server.introspect
diff --git a/avahi-dnsconfd/Makefile.am b/avahi-dnsconfd/Makefile.am
index 3b3c79e..db21810 100644
--- a/avahi-dnsconfd/Makefile.am
+++ b/avahi-dnsconfd/Makefile.am
@@ -36,7 +36,7 @@ AM_LDADD+=$(LIBDAEMON_LIBS)
# This cool debug trap works on i386/gcc only
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
-bin_PROGRAMS = \
+sbin_PROGRAMS = \
avahi-dnsconfd
avahi_dnsconfd_SOURCES = \
diff --git a/initscript/Debian/75avahi-daemon b/initscript/Debian/75avahi-daemon.in
index 82377dd..337fed6 100755
--- a/initscript/Debian/75avahi-daemon
+++ b/initscript/Debian/75avahi-daemon.in
@@ -62,7 +62,7 @@ fi
PATH=/sbin:/bin:/usr/sbin:/usr/bin
DESC="Avahi ZeroConf daemon"
NAME="avahi-daemon"
-DAEMON=/usr/bin/$NAME
+DAEMON="@sbindir@/$NAME"
# Gracefully exit if the package has been removed.
test -x $DAEMON || exit 0
diff --git a/initscript/Debian/Makefile.am b/initscript/Debian/Makefile.am
index 811526d..89e6663 100644
--- a/initscript/Debian/Makefile.am
+++ b/initscript/Debian/Makefile.am
@@ -1,9 +1,22 @@
+
+EXTRA_DIST=75avahi-daemon.in avahi-dnsconfd.in
+
dbusinitddir = $(sysconfdir)/dbus-1/event.d
dbusinitd_SCRIPTS = 75avahi-daemon
initddir = $(sysconfdir)/init.d
initd_SCRIPTS = avahi-dnsconfd
+CLEANFILES=75avahi-daemon avahi-dnsconfd
+
+75avahi-daemon: 75avahi-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 \
diff --git a/initscript/Debian/avahi-dnsconfd b/initscript/Debian/avahi-dnsconfd.in
index 7b2e131..eb67a91 100755
--- a/initscript/Debian/avahi-dnsconfd
+++ b/initscript/Debian/avahi-dnsconfd.in
@@ -62,7 +62,7 @@ fi
PATH=/sbin:/bin:/usr/sbin:/usr/bin
DESC="Avahi Dns Config daemon"
NAME="avahi-dnsconfd"
-DAEMON=/usr/bin/$NAME
+DAEMON="@sbindir@/$NAME"
# Gracefully exit if the package has been removed.
test -x $DAEMON || exit 0