Index: /trunk/service-type-database/Makefile.am
===================================================================
--- /trunk/service-type-database/Makefile.am (revision 1394)
+++ /trunk/service-type-database/Makefile.am (revision 1537)
@@ -21,4 +21,5 @@
 
 pkgdata_DATA=service-types
+pkglib_DATA=
 
 if HAVE_PYTHON
@@ -26,5 +27,5 @@
 
 noinst_SCRIPTS=build-db
-pkgdata_DATA+=service-types.db
+pkglib_DATA+=service-types.db
 
 build-db: build-db.in
@@ -43,5 +44,5 @@
 
 noinst_SCRIPTS=build-db
-pkgdata_DATA+=service-types.db.pag service-types.db.dir
+pkglib_DATA+=service-types.db.pag service-types.db.dir
 
 build-db: build-db.in
Index: /trunk/avahi-utils/Makefile.am
===================================================================
--- /trunk/avahi-utils/Makefile.am (revision 1263)
+++ /trunk/avahi-utils/Makefile.am (revision 1537)
@@ -33,5 +33,5 @@
 if HAVE_GDBM
 avahi_browse_SOURCES += stdb.h stdb.c
-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 avahi_browse_LDADD += -lgdbm
 endif
@@ -39,5 +39,5 @@
 if HAVE_DBM
 avahi_browse_SOURCES += stdb.h stdb.c
-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 endif
 
Index: /trunk/avahi-ui/Makefile.am
===================================================================
--- /trunk/avahi-ui/Makefile.am (revision 1457)
+++ /trunk/avahi-ui/Makefile.am (revision 1537)
@@ -48,5 +48,5 @@
 if HAVE_GDBM
 libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 libavahi_ui_la_LIBADD += -lgdbm
 endif
@@ -54,5 +54,5 @@
 if HAVE_DBM
 libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 endif
 
Index: /trunk/avahi-python/avahi/ServiceTypeDatabase.py.in
===================================================================
--- /trunk/avahi-python/avahi/ServiceTypeDatabase.py.in (revision 1245)
+++ /trunk/avahi-python/avahi/ServiceTypeDatabase.py.in (revision 1540)
@@ -28,5 +28,5 @@
 class ServiceTypeDatabase:
 
-    def __init__(self, filename = "@pkgdatadir@/service-types.db"):
+    def __init__(self, filename = "@pkglibdir@/service-types.db"):
 
         self.db = @DBM@.open(filename, "r")
Index: /trunk/avahi-python/avahi/Makefile.am
===================================================================
--- /trunk/avahi-python/avahi/Makefile.am (revision 1539)
+++ /trunk/avahi-python/avahi/Makefile.am (revision 1540)
@@ -34,5 +34,5 @@
 		-e 's,@CHECK_KEY\@,while key is not None:,g' \
 		-e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \
-		-e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@
+		-e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@
 	chmod +x $@
 endif
@@ -47,5 +47,5 @@
 		-e 's,@CHECK_KEY\@,for key in keys:,g' \
 		-e 's,@NEXT_KEY\@,,g' \
-		-e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@
+		-e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@
 	chmod +x $@
 endif