out-of-tree build: generate ./run from template, fix image checks

[libguestfs.git] / images / Makefile.am

diff --git a/images/Makefile.am b/images/Makefile.am
index 40bf90f..90c4ce3 100644 (file)
--- 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 \
@@ -101,7 +103,7 @@ images_files = $(images_files_src) $(images_files_build)
 test.iso: $(images_files)
        rm -f $@ $@-t
        mkdir -p directory
-       $(MKISOFS) -J -r -graft-points \
+       $(GENISOIMAGE) -J -r -graft-points \
          -o $@-t \
          $(images_files) /directory=directory
        rmdir directory
@@ -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