--- avahi-0.6.31.old/avahi-daemon/Makefile.am
+++ avahi-0.6.31/avahi-daemon/Makefile.am
@@ -25,8 +25,9 @@
 
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
-introspectiondir=$(datadir)/dbus-1/interfaces
-dbussystemservicesdir=$(datadir)/dbus-1/system-services
+dbusdir=__META_PRODTREE__/dbus/share
+introspectiondir=$(dbusdir)/dbus-1/interfaces
+dbussystemservicesdir=$(dbusdir)/dbus-1/system-services
 
 AM_CFLAGS+= \
 	-DAVAHI_DAEMON_RUNTIME_DIR=\"$(avahi_runtime_dir)/avahi-daemon/\" \
--- avahi-0.6.31.old/avahi-daemon/Makefile.in
+++ avahi-0.6.31/avahi-daemon/Makefile.in
@@ -520,8 +520,9 @@
 	$(am__append_1)
 @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@pkgsysconfdir = $(sysconfdir)/avahi
 @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@servicedir = $(pkgsysconfdir)/services
-@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@introspectiondir = $(datadir)/dbus-1/interfaces
-@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@dbussystemservicesdir = $(datadir)/dbus-1/system-services
+@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@dbusdir = __META_PRODTREE__/dbus/share
+@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@introspectiondir = $(dbusdir)/dbus-1/interfaces
+@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@dbussystemservicesdir = $(dbusdir)/dbus-1/system-services
 @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@avahi_daemon_SOURCES = main.c \
 @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	main.h simple-protocol.c \
 @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	simple-protocol.h \