* Patch by Ikke <ikke@eikke.com> to make distcheck pass.

[catta] / avahi-daemon / Makefile.am

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 1e9db4d42e3adabbd49c10e4861787e59b65ca9b..3762ba531fc3c17135023d5869aeec4e5968bcac 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -22,11 +22,10 @@ servicedir=$(pkgsysconfdir)/services
 
 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
@@ -37,7 +36,6 @@ AM_LDADD+=$(GLIB20_LIBS)
 AM_CFLAGS+=$(LIBDAEMON_CFLAGS)
 AM_LDADD+=$(LIBDAEMON_LIBS)
 
-
 if ENABLE_DBUS
 # DBUS
 AM_CFLAGS+=$(DBUS_CFLAGS)
@@ -64,8 +62,15 @@ service_DATA = \
 pkgdata_DATA = \
        avahi-service.dtd
 
+EXTRA_DIST = avahi-service.dtd avahi.conf example.service
+
 if ENABLE_DBUS
 avahi_SOURCES += dbus-protocol.c dbus-protocol.h
+
+dbusservicedir = $(DBUS_SYS_DIR)
+dbusservice_DATA = avahi-dbus.conf
+
+EXTRA_DIST += $(dbusservice_DATA)
 endif
 
 avahi_CFLAGS = $(AM_CFLAGS)