diff options
| -rw-r--r-- | avahi-daemon/Makefile.am | 16 | ||||
| -rw-r--r-- | avahi-daemon/README | 6 | ||||
| -rw-r--r-- | avahi-daemon/avahi-daemon.conf (renamed from avahi-daemon/avahi.conf) | 0 | ||||
| -rwxr-xr-x | initscript/Debian/75avahi-daemon (renamed from initscript/Debian/75avahi) | 2 | ||||
| -rw-r--r-- | initscript/Debian/Makefile.am | 2 | ||||
| -rw-r--r-- | initscript/Gentoo/Makefile.am | 2 | ||||
| -rw-r--r-- | initscript/Gentoo/avahi-daemon (renamed from initscript/Gentoo/avahi) | 2 | ||||
| -rw-r--r-- | initscript/SUSE/Makefile.am | 2 | ||||
| -rw-r--r-- | initscript/SUSE/avahi-daemon (renamed from initscript/SUSE/avahi) | 2 |
9 files changed, 14 insertions, 20 deletions
diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am index 2f09490..f746a49 100644 --- a/avahi-daemon/Makefile.am +++ b/avahi-daemon/Makefile.am @@ -25,7 +25,7 @@ AM_CFLAGS= \ -DAVAHI_DAEMON_RUNTIME_DIR=\"$(avahi_runtime_dir)/avahi-daemon/\" \ -DAVAHI_SOCKET=\"$(avahi_socket)\" \ -DAVAHI_SERVICE_DIRECTORY=\"$(servicedir)\" \ - -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\" + -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi-daemon.conf\" AM_LDADD=-lexpat @@ -48,15 +48,15 @@ endif AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' bin_PROGRAMS = \ - avahi + avahi-daemon -avahi_SOURCES = \ +avahi_daemon_SOURCES = \ main.c main.h \ simple-protocol.c simple-protocol.h \ static-services.c static-services.h pkgsysconf_DATA = \ - avahi.conf + avahi-daemon.conf service_DATA = \ example.service @@ -64,10 +64,10 @@ service_DATA = \ pkgdata_DATA = \ avahi-service.dtd -EXTRA_DIST = avahi-service.dtd avahi.conf example.service +EXTRA_DIST = avahi-service.dtd avahi-daemon.conf example.service if ENABLE_DBUS -avahi_SOURCES += dbus-protocol.c dbus-protocol.h +avahi_daemon_SOURCES += dbus-protocol.c dbus-protocol.h dbusservicedir = $(DBUS_SYS_DIR) dbusservice_DATA = avahi-dbus.conf @@ -75,8 +75,8 @@ dbusservice_DATA = avahi-dbus.conf EXTRA_DIST += $(dbusservice_DATA) endif -avahi_CFLAGS = $(AM_CFLAGS) -avahi_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la +avahi_daemon_CFLAGS = $(AM_CFLAGS) +avahi_daemon_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la xmllint: xmllint --noout --valid example.service diff --git a/avahi-daemon/README b/avahi-daemon/README deleted file mode 100644 index e5f6405..0000000 --- a/avahi-daemon/README +++ /dev/null @@ -1,6 +0,0 @@ -On most systems you will need to setup a security policy for avahi to allow it to own the Avahi service on the system d-bus. - -You can find an example in avahi.conf.example, this usually goes in /etc/dbus-1/system.d -You will need to change the username 'lathiat' to whatever username you use for testing this code (later it will be a dedicated 'avahi' user) - -In future this stuff should be handled automatically but for now some manual setup is required. diff --git a/avahi-daemon/avahi.conf b/avahi-daemon/avahi-daemon.conf index fc47ecf..fc47ecf 100644 --- a/avahi-daemon/avahi.conf +++ b/avahi-daemon/avahi-daemon.conf diff --git a/initscript/Debian/75avahi b/initscript/Debian/75avahi-daemon index 00d8fb6..82377dd 100755 --- a/initscript/Debian/75avahi +++ b/initscript/Debian/75avahi-daemon @@ -61,7 +61,7 @@ fi PATH=/sbin:/bin:/usr/sbin:/usr/bin DESC="Avahi ZeroConf daemon" -NAME="avahi" +NAME="avahi-daemon" DAEMON=/usr/bin/$NAME # Gracefully exit if the package has been removed. diff --git a/initscript/Debian/Makefile.am b/initscript/Debian/Makefile.am index 77b137e..811526d 100644 --- a/initscript/Debian/Makefile.am +++ b/initscript/Debian/Makefile.am @@ -1,5 +1,5 @@ dbusinitddir = $(sysconfdir)/dbus-1/event.d -dbusinitd_SCRIPTS = 75avahi +dbusinitd_SCRIPTS = 75avahi-daemon initddir = $(sysconfdir)/init.d initd_SCRIPTS = avahi-dnsconfd diff --git a/initscript/Gentoo/Makefile.am b/initscript/Gentoo/Makefile.am index 7e9abf5..58d35dd 100644 --- a/initscript/Gentoo/Makefile.am +++ b/initscript/Gentoo/Makefile.am @@ -1,4 +1,4 @@ dbusinitddir = $(sysconfdir)/init.d -dbusinitd_SCRIPTS = avahi +dbusinitd_SCRIPTS = avahi-daemon EXTRA_DIST = $(dbusinitd_SCRIPTS) diff --git a/initscript/Gentoo/avahi b/initscript/Gentoo/avahi-daemon index a37c965..532d108 100644 --- a/initscript/Gentoo/avahi +++ b/initscript/Gentoo/avahi-daemon @@ -2,7 +2,7 @@ # Avahi ZeroConf Daemon init script # Many thanks to the Avahi developer's and Sebastien Estienne -DAEMON=/usr/bin/avahi +DAEMON=/usr/bin/avahi-daemon depend () { need dbus diff --git a/initscript/SUSE/Makefile.am b/initscript/SUSE/Makefile.am index 7e9abf5..58d35dd 100644 --- a/initscript/SUSE/Makefile.am +++ b/initscript/SUSE/Makefile.am @@ -1,4 +1,4 @@ dbusinitddir = $(sysconfdir)/init.d -dbusinitd_SCRIPTS = avahi +dbusinitd_SCRIPTS = avahi-daemon EXTRA_DIST = $(dbusinitd_SCRIPTS) diff --git a/initscript/SUSE/avahi b/initscript/SUSE/avahi-daemon index bd0cba1..59bd0c9 100644 --- a/initscript/SUSE/avahi +++ b/initscript/SUSE/avahi-daemon @@ -7,7 +7,7 @@ # Description: Avahi, a ZeroConf daemon for mDNS and service registration ### END INIT INFO -AVAHI_BIN=/usr/bin/avahi +AVAHI_BIN=/usr/bin/avahi-daemon test -x $AVAHI_BIN || exit 5 . /etc/rc.status |