diff options
author | Lennart Poettering <lennart@poettering.net> | 2005-07-30 12:21:59 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2005-07-30 12:21:59 +0000 |
commit | 656aec05e83a12adfea8c5d98da2c0220ec54e4a (patch) | |
tree | 982e0368a4e75bda962f7001d4df1d7d1fb2f33c /initscript | |
parent | 48cfb3c876636d79dace3ebc8e82c946bc0b7ebf (diff) | |
download | avahi-656aec05e83a12adfea8c5d98da2c0220ec54e4a.tar.gz |
* Move avahi-daemon and avahi-dnsconfd to sbin
* Fix Debian init scripts to use absolute paths to the binaries installed with the package
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@196 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'initscript')
-rwxr-xr-x | initscript/Debian/75avahi-daemon.in (renamed from initscript/Debian/75avahi-daemon) | 2 | ||||
-rw-r--r-- | initscript/Debian/Makefile.am | 13 | ||||
-rwxr-xr-x | initscript/Debian/avahi-dnsconfd.in (renamed from initscript/Debian/avahi-dnsconfd) | 2 |
3 files changed, 15 insertions, 2 deletions
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 |