* moved AVAHI_RUNTIME_DIR and AVAHI_SOCKET in configure.ac

[catta] / avahi-daemon / Makefile.am

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 4c943e48717fa0f00a3fb94655239b6b3234430f..6ad5421b1f0ebe9da74c9f489370ee0f74e8a2cd 100644 (file)
--- 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_RUNTIME_DIR=\"$(localstatedir)/run/avahi\"
+       -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\"
+
 
 AM_LDADD=-lexpat
 
@@ -67,6 +66,7 @@ pkgdata_DATA = \
 if ENABLE_DBUS
 avahi_SOURCES += dbus-protocol.c dbus-protocol.h
 
+dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = avahi-dbus.conf
 
 EXTRA_DIST = $(dbusservice_DATA)