virt-sysprep: Trap ERR as well as EXIT.

[libguestfs.git] / inspector / Makefile.am

diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 435ba87..03e13d8 100644 (file)
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -33,7 +33,6 @@ EXAMPLE_XML = \
        example-windows-xp-cd.xml
 
 EXTRA_DIST = \
-       run-inspector-locally \
        virt-inspector.pod
 
 CLEANFILES = stamp-virt-inspector.pod
@@ -60,6 +59,7 @@ virt_inspector_SOURCES = \
        virt-inspector.c
 
 virt_inspector_CFLAGS = \
+       -DGUESTFS_WARN_DEPRECATED=1 \
        -I$(top_srcdir)/src -I$(top_builddir)/src \
        -I$(top_srcdir)/fish \
        -I$(srcdir)/../gnulib/lib -I../gnulib/lib \
@@ -81,7 +81,7 @@ noinst_DATA = $(top_builddir)/html/virt-inspector.1.html
 virt-inspector.1 $(top_builddir)/html/virt-inspector.1.html: stamp-virt-inspector.pod
 
 stamp-virt-inspector.pod: virt-inspector.pod
-       $(top_srcdir)/podwrapper.sh \
+       $(top_builddir)/podwrapper.sh \
          --man virt-inspector.1 \
          --html $(top_builddir)/html/virt-inspector.1.html \
          $<
@@ -101,17 +101,18 @@ endif
 
 example-debian.xml:
        rm -f $@ $@-t
-       ./run-inspector-locally ../images/debian.img > $@-t
+       ../run $(builddir)/virt-inspector ../images/debian.img > $@-t
        mv $@-t $@
 example-fedora.xml:
        rm -f $@ $@-t
-       ./run-inspector-locally ../images/fedora.img > $@-t
+       ../run $(builddir)/virt-inspector ../images/fedora.img > $@-t
        mv $@-t $@
 example-ubuntu.xml:
        rm -f $@ $@-t
-       ./run-inspector-locally ../images/ubuntu.img > $@-t
+       ../run $(builddir)/virt-inspector ../images/ubuntu.img > $@-t
        mv $@-t $@
 example-windows.xml:
        rm -f $@ $@-t
-       ./run-inspector-locally ../images/windows.img | fgrep -v '<uuid>' > $@-t
+       ../run $(builddir)/virt-inspector ../images/windows.img | \
+           fgrep -v '<uuid>' > $@-t
        mv $@-t $@