git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fish: Improve error messages when no OS / multi-boot OS found with inspection (RHBZ...
[libguestfs.git]
/
images
/
Makefile.am
diff --git
a/images/Makefile.am
b/images/Makefile.am
index
68eb550
..
1cae8bf
100644
(file)
--- 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
#
# 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
include $(top_srcdir)/subdir-rules.mk
@@
-173,41
+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
fedora.img: guest-aux/make-fedora-img.sh \
guest-aux/fedora-name.db \
guest-aux/fedora-packages.db
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
TMPDIR=$(top_builddir) \
TMPDIR=$(top_builddir) \
+ SRCDIR=$(srcdir) \
bash $<
guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt
rm -f $@ $@-t
bash $<
guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt
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
$(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
$(DB_LOAD) $@-t < $<
mv $@-t $@
# Make a (dummy) Debian image.
debian.img: guest-aux/make-debian-img.sh
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
TMPDIR=$(top_builddir) \
TMPDIR=$(top_builddir) \
+ SRCDIR=$(srcdir) \
bash $<
# Make a (dummy) Ubuntu image.
ubuntu.img: guest-aux/make-ubuntu-img.sh
bash $<
# Make a (dummy) Ubuntu image.
ubuntu.img: guest-aux/make-ubuntu-img.sh
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
TMPDIR=$(top_builddir) \
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
bash $<
# Make a (dummy) Windows image.
windows.img: guest-aux/make-windows-img.sh \
guest-aux/windows-software guest-aux/windows-system
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
TMPDIR=$(top_builddir) \
TMPDIR=$(top_builddir) \
+ SRCDIR=$(srcdir) \
bash $<
# Since users might not have the tools needed to create this, we
bash $<
# Since users might not have the tools needed to create this, we