X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=images%2FMakefile.am;h=8d0755d548e1aa8aac9af212975a527566560074;hb=74ea723c8246d63ca3f125ffc2e7e4be4a561546;hp=d45e69956f083868ca9d615be44fb8c3c6c6bdb8;hpb=5eaffede90d454a9d6542331a77e3a88928705e3;p=libguestfs.git

diff --git a/images/Makefile.am b/images/Makefile.am
index d45e699..8d0755d 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -171,28 +171,34 @@ $(builddir)/test-grep.txt.gz: test-grep.txt
 fedora.img: guest-aux/make-fedora-img.sh guest-aux/fedora-name.db
 	LIBGUESTFS_PATH=../appliance \
 	LD_LIBRARY_PATH=../src/.libs \
+	TMPDIR=$(top_builddir) \
 	bash $<
 
 guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt
-	$(DB_LOAD) $@ < $<
+	rm -f $@ $@-t
+	$(DB_LOAD) $@-t < $<
+	mv $@-t $@
 
 # Make a (dummy) Debian image.
 debian.img: guest-aux/make-debian-img.sh
-	LIBGUESTFS_PATH=../appliance \
-	LD_LIBRARY_PATH=../src/.libs \
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+	TMPDIR=$(top_builddir) \
 	bash $<
 
 # Make a (dummy) Ubuntu image.
 ubuntu.img: guest-aux/make-ubuntu-img.sh
-	LIBGUESTFS_PATH=../appliance \
-	LD_LIBRARY_PATH=../src/.libs \
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+	TMPDIR=$(top_builddir) \
 	bash $<
 
 # Make a (dummy) Windows image.
 windows.img: guest-aux/make-windows-img.sh \
 	     guest-aux/windows-software guest-aux/windows-system
-	LIBGUESTFS_PATH=../appliance \
-	LD_LIBRARY_PATH=../src/.libs \
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+	TMPDIR=$(top_builddir) \
 	bash $<
 
 # Since users might not have the tools needed to create this, we