* 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 bb983a37b032c9164512c477ae699a72cfc25984..3762ba531fc3c17135023d5869aeec4e5968bcac 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -17,7 +17,15 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-AM_CFLAGS=-I$(top_srcdir) -D_GNU_SOURCE -DAVAHI_SERVICE_DIRECTORY=\"`pwd`\" -DAVAHI_CONFIG_FILE=\"avahi.conf\"
+pkgsysconfdir=$(sysconfdir)/avahi
+servicedir=$(pkgsysconfdir)/services
+
+AM_CFLAGS= \
+       -I$(top_srcdir) \
+       -DAVAHI_SERVICE_DIRECTORY=\"$(servicedir)\" \
+       -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\"
+
+
 AM_LDADD=-lexpat
 
 # GLIB 2.0
@@ -28,7 +36,6 @@ AM_LDADD+=$(GLIB20_LIBS)
 AM_CFLAGS+=$(LIBDAEMON_CFLAGS)
 AM_LDADD+=$(LIBDAEMON_LIBS)
 
-
 if ENABLE_DBUS
 # DBUS
 AM_CFLAGS+=$(DBUS_CFLAGS)
@@ -46,8 +53,24 @@ avahi_SOURCES = \
        simple-protocol.c simple-protocol.h \
        static-services.c static-services.h
 
+pkgsysconf_DATA = \
+       avahi.conf
+
+service_DATA = \
+       example.service
+
+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)