X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=images%2FMakefile.am;h=1cae8bfa1898f6b0d5abac82120fd03478c7d7c8;hb=730fb50780df860474dc1fae16c9891187e99c82;hp=d45e69956f083868ca9d615be44fb8c3c6c6bdb8;hpb=5eaffede90d454a9d6542331a77e3a88928705e3;p=libguestfs.git

diff --git a/images/Makefile.am b/images/Makefile.am
index d45e699..1cae8bf 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/subdir-rules.mk
 
@@ -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 \
@@ -168,31 +170,42 @@ $(builddir)/test-grep.txt.gz: test-grep.txt
 	mv $@-t $@
 
 # Make a (dummy) Fedora image.
-fedora.img: guest-aux/make-fedora-img.sh guest-aux/fedora-name.db
-	LIBGUESTFS_PATH=../appliance \
-	LD_LIBRARY_PATH=../src/.libs \
+fedora.img: guest-aux/make-fedora-img.sh \
+		guest-aux/fedora-name.db \
+		guest-aux/fedora-packages.db
+	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
+	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