build-sys: compatibility with newer automake

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

diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
index 4e0c9f86cd3413743484fa88db3106aed58a948f..1e9e70f9e89054a9709d4b7cd68dcd2fb2dcce9d 100644 (file)
--- 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,21 +17,24 @@
 
 EXTRA_DIST=build-db.in service-types
 
+pkglibdatadir=$(prefix)/lib/avahi
+
 pkgdata_DATA=service-types
+pkglibdata_DATA=
 
 if HAVE_PYTHON
 if HAVE_GDBM
 
 noinst_SCRIPTS=build-db
-pkgdata_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
@@ -42,18 +43,20 @@ endif
 if HAVE_DBM
 
 noinst_SCRIPTS=build-db
-pkgdata_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
+       $(AM_V_GEN)mv service-types.db.coming.pag service-types.db.pag
 service-types.db.dir: service-types.db
+       $(AM_V_GEN)mv service-types.db.coming.dir service-types.db.dir
 service-types.db: service-types build-db
-       $(PYTHON) build-db $< $@.coming
-       mv $@.coming $@
+       $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
+       if test -f "$@.coming"; then mv $@.coming $@; fi
 
 CLEANFILES = service-types.db* build-db