fix avahi_netlink_new to allow multiple netlinks per process

[catta] / service-type-database / Makefile.am

diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
index 6419ba7729449d138b2e1798a7cde4c0e58b4110..b43e2cb71c47237dba1193829d49c28f708b4d76 100644 (file)
--- a/service-type-database/Makefile.am
+++ b/service-type-database/Makefile.am
@@ -17,22 +17,24 @@
 
 EXTRA_DIST=build-db.in service-types
 
+pkglibdatadir=$(libdir)/avahi
+
 pkgdata_DATA=service-types
-pkglib_DATA=
+pkglibdata_DATA=
 
 if HAVE_PYTHON
 if HAVE_GDBM
 
 noinst_SCRIPTS=build-db
-pkglib_DATA+=service-types.db
+pkglibdata_DATA+=service-types.db
 
 build-db: build-db.in
-       sed -e 's,@PYTHON\@,$(PYTHON),g' \
-           -e 's,@DBM\@,gdbm,g' $< > $@
+       $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
+           -e 's,@DBM\@,gdbm,g' $< > $@ && \
        chmod +x $@
 
 service-types.db: service-types build-db
-       $(PYTHON) build-db $< $@.coming
+       $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
        mv $@.coming $@
 
 CLEANFILES = service-types.db build-db
@@ -41,19 +43,19 @@ endif
 if HAVE_DBM
 
 noinst_SCRIPTS=build-db
-pkglib_DATA+=service-types.db.pag service-types.db.dir
+pkglibdata_DATA+=service-types.db.pag service-types.db.dir
 
 build-db: build-db.in
-       sed -e 's,@PYTHON\@,$(PYTHON),g' \
-           -e 's,@DBM\@,dbm,g' $< > $@
+       $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
+           -e 's,@DBM\@,dbm,g' $< > $@ && \
        chmod +x $@
 
 service-types.db.pag: service-types.db
-       mv service-types.db.coming.pag service-types.db.pag
+       $(AM_V_GEN)mv service-types.db.coming.pag service-types.db.pag
 service-types.db.dir: service-types.db
-       mv service-types.db.coming.dir service-types.db.dir
+       $(AM_V_GEN)mv service-types.db.coming.dir service-types.db.dir
 service-types.db: service-types build-db
-       $(PYTHON) build-db $< $@.coming
+       $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
        if test -f "$@.coming"; then mv $@.coming $@; fi
 
 CLEANFILES = service-types.db* build-db