diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-09-16 13:25:32 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-09-16 13:36:00 +0200 |
| commit | 1860bdae8cdf4f9eb7097fd7e5ed7e9c0c5b6a75 (patch) | |
| tree | b3b4fb6139799602676e100126c19055b18ac7f0 /package/avahi/avahi.mk | |
| parent | c106fdbd100f36fe3329360af8f656566937f00a (diff) | |
| parent | ae2be8dbc36293d8243baf2b13ad17a47738d6d3 (diff) | |
| download | buildroot-novena-1860bdae8cdf4f9eb7097fd7e5ed7e9c0c5b6a75.tar.gz buildroot-novena-1860bdae8cdf4f9eb7097fd7e5ed7e9c0c5b6a75.zip | |
Merge branch 'for-2010.11/remove-oldstyle-hooks' of git://git.busybox.net/~tpetazzoni/git/buildroot
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/avahi/avahi.mk')
| -rw-r--r-- | package/avahi/avahi.mk | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 8e2d14f6e..e1bebd914 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -137,19 +137,31 @@ AVAHI_DEPENDENCIES += libintl AVAHI_MAKE_OPT = LIBS=-lintl endif -$(eval $(call AUTOTARGETS,package,avahi)) - -$(AVAHI_HOOK_POST_INSTALL): +define AVAHI_REMOVE_INITSCRIPT rm -rf $(TARGET_DIR)/etc/init.d/avahi-* -ifeq ($(BR2_PACKAGE_AVAHI_AUTOIPD),y) +endef + +AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_REMOVE_INITSCRIPT + +define AVAHI_INSTALL_AUTOIPD rm -rf $(TARGET_DIR)/etc/dhcp3/ $(INSTALL) -D -m 0755 package/avahi/busybox-udhcpc-default.script $(TARGET_DIR)/usr/share/udhcpc/default.script $(INSTALL) -m 0755 package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/ rm -f $(TARGET_DIR)/var/lib/avahi-autoipd $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/lib ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd +endef + +ifeq ($(BR2_PACKAGE_AVAHI_AUTOIPD),y) +AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_AUTOIPD endif -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y) + +define AVAHI_INSTALL_DAEMON_INITSCRIPT $(INSTALL) -m 0755 package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/ +endef + +ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y) +AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_DAEMON_INITSCRIPT endif - touch $@ + +$(eval $(call AUTOTARGETS,package,avahi)) |