X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=service-type-database%2FMakefile.am;h=b43e2cb71c47237dba1193829d49c28f708b4d76;hb=468519681b09f00851e1d4dd658b939e4e938cf6;hp=60fda4524d8cc3087c793ab4fd95a3172e17213d;hpb=c26c9b195bd3eb56880abdec89a8a02d045046d4;p=catta

diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
index 60fda45..b43e2cb 100644
--- a/service-type-database/Makefile.am
+++ b/service-type-database/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
 # This file is part of avahi.
-# 
+#
 # avahi is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2 of the
@@ -19,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
@@ -43,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