X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=images%2FMakefile.am;h=90c4ce31205d4e9a662c727848a25d019690eb54;hb=31bf0cf313f21bdeb0d166c4c76aad050ad32232;hp=97fccce9bafe8cff229668027755b34486da64f9;hpb=d95874db3dc6c415061b86275d03770b4f28ffbb;p=libguestfs.git

diff --git a/images/Makefile.am b/images/Makefile.am
index 97fccce..90c4ce3 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -42,6 +42,8 @@ EXTRA_DIST = \
 	guest-aux/make-fedora-img.sh \
 	guest-aux/fedora-name.db.txt \
 	guest-aux/fedora-name.db \
+	guest-aux/fedora-packages.db.txt \
+	guest-aux/fedora-packages.db \
 	guest-aux/make-ubuntu-img.sh \
 	guest-aux/make-windows-img.sh \
 	guest-aux/windows-software \
@@ -171,33 +173,39 @@ $(builddir)/test-grep.txt.gz: test-grep.txt
 fedora.img: guest-aux/make-fedora-img.sh \
 		guest-aux/fedora-name.db \
 		guest-aux/fedora-packages.db
-	LIBGUESTFS_PATH=../appliance \
-	LD_LIBRARY_PATH=../src/.libs \
+	TMPDIR=$(top_builddir) \
+	SRCDIR=$(srcdir) \
 	bash $<
 
 guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt
-	$(DB_LOAD) $@ < $<
+	rm -f $@ $@-t
+	mkdir -p guest-aux
+	$(DB_LOAD) $@-t < $<
+	mv $@-t $@
 
 guest-aux/fedora-packages.db: guest-aux/fedora-packages.db.txt
-	$(DB_LOAD) $@ < $<
+	rm -f $@ $@-t
+	mkdir -p guest-aux
+	$(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 \
+	TMPDIR=$(top_builddir) \
+	SRCDIR=$(srcdir) \
 	bash $<
 
 # Make a (dummy) Ubuntu image.
 ubuntu.img: guest-aux/make-ubuntu-img.sh
-	LIBGUESTFS_PATH=../appliance \
-	LD_LIBRARY_PATH=../src/.libs \
+	TMPDIR=$(top_builddir) \
+	SRCDIR=$(srcdir) \
 	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 \
+	TMPDIR=$(top_builddir) \
+	SRCDIR=$(srcdir) \
 	bash $<
 
 # Since users might not have the tools needed to create this, we