From e26b546ee463cdbe2433367f6bcb9aec476fbee0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 20 Jun 2005 22:27:45 +0000 Subject: Add patches from Sebastien Estienne git-svn-id: file:///home/lennart/svn/public/avahi/trunk@131 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-daemon/Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'avahi-daemon/Makefile.am') diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am index 1e9db4d..0682fba 100644 --- a/avahi-daemon/Makefile.am +++ b/avahi-daemon/Makefile.am @@ -19,14 +19,13 @@ pkgsysconfdir=$(sysconfdir)/avahi servicedir=$(pkgsysconfdir)/services +dbusservicedir=$(DBUS_SYS_DIR) AM_CFLAGS= \ -I$(top_srcdir) \ -D_GNU_SOURCE \ -DAVAHI_SERVICE_DIRECTORY=\"$(servicedir)\" \ - -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\" \ - -DAVAHI_USER=\"avahi\" \ - -DAVAHI_GROUP=\"avahi\" + -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\" AM_LDADD=-lexpat # GLIB 2.0 @@ -66,6 +65,10 @@ pkgdata_DATA = \ if ENABLE_DBUS avahi_SOURCES += dbus-protocol.c dbus-protocol.h + +dbusservice_DATA = avahi-dbus.conf + +EXTRA_DIST = $(dbusservice_DATA) endif avahi_CFLAGS = $(AM_CFLAGS) -- cgit