Make init scripts fail faster; patch from scop

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

diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
index 4e0c9f86cd3413743484fa88db3106aed58a948f..60fda4524d8cc3087c793ab4fd95a3172e17213d 100644 (file)
--- a/service-type-database/Makefile.am
+++ b/service-type-database/Makefile.am
@@ -20,12 +20,13 @@
 EXTRA_DIST=build-db.in service-types
 
 pkgdata_DATA=service-types
+pkglib_DATA=
 
 if HAVE_PYTHON
 if HAVE_GDBM
 
 noinst_SCRIPTS=build-db
-pkgdata_DATA+=service-types.db
+pkglib_DATA+=service-types.db
 
 build-db: build-db.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' \
@@ -42,7 +43,7 @@ endif
 if HAVE_DBM
 
 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
        sed -e 's,@PYTHON\@,$(PYTHON),g' \
@@ -50,10 +51,12 @@ build-db: build-db.in
        chmod +x $@
 
 service-types.db.pag: service-types.db
+       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
 service-types.db: service-types build-db
        $(PYTHON) build-db $< $@.coming
-       mv $@.coming $@
+       if test -f "$@.coming"; then mv $@.coming $@; fi
 
 CLEANFILES = service-types.db* build-db