Message ID | 1436813720-4458-1-git-send-email-aurelien@chabot.fr |
---|---|
State | Accepted |
Headers | show |
Dear Aurélien Chabot, On Mon, 13 Jul 2015 20:55:20 +0200, Aurélien Chabot wrote: > Signed-off-by: Aurélien Chabot <aurelien@chabot.fr> > --- > package/avahi/avahi.mk | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk > index 24967f4..b241748 100644 > --- a/package/avahi/avahi.mk > +++ b/package/avahi/avahi.mk > @@ -90,8 +90,11 @@ AVAHI_DEPENDENCIES = \ > > AVAHI_CFLAGS = $(TARGET_CFLAGS) > > -ifeq ($(BR2_PACKAGE_SYSTEMD),) > -AVAHI_CFLAGS += -DDISABLE_SYSTEMD > +ifeq ($(BR2_PACKAGE_SYSTEMD),y) > + AVAHI_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system Such variable assignments should not be indented. Committed, thanks! Thomas
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 24967f4..b241748 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -90,8 +90,11 @@ AVAHI_DEPENDENCIES = \ AVAHI_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_PACKAGE_SYSTEMD),) -AVAHI_CFLAGS += -DDISABLE_SYSTEMD +ifeq ($(BR2_PACKAGE_SYSTEMD),y) + AVAHI_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system +else + AVAHI_CONF_OPTS += --with-systemdsystemunitdir=no + AVAHI_CFLAGS += -DDISABLE_SYSTEMD endif ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
Signed-off-by: Aurélien Chabot <aurelien@chabot.fr> --- package/avahi/avahi.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)