diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-07-26 21:56:37 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-07-26 21:58:17 +0100 |
| commit | 590774ed9e005dc85ca6851939e76d02da6624c8 (patch) | |
| tree | 1e01c695d1e59ffa4add112eb19c694e128e8541 | |
| parent | 96d34d883f309ede4c889e852cef68dc5c9e45b9 (diff) | |
| download | libguestfs-590774ed9e005dc85ca6851939e76d02da6624c8.tar.gz libguestfs-590774ed9e005dc85ca6851939e76d02da6624c8.tar.xz libguestfs-590774ed9e005dc85ca6851939e76d02da6624c8.zip | |
build: Use $(top_builddir)/run in Makefile.am's.
Not necessary, but this makes all invocations of 'run' consistent.
There is no functional change.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | inspector/Makefile.am | 8 | ||||
| -rw-r--r-- | sysprep/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/guests/Makefile.am | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index cc1e8c80..2954be19 100644 --- a/Makefile.am +++ b/Makefile.am @@ -252,7 +252,7 @@ CLEANFILES = \ # is NOT a substitute for proper testing! quickcheck: - ./run test-tool/libguestfs-test-tool $(QUICKCHECK_TEST_TOOL_ARGS) + $(top_builddir)/run test-tool/libguestfs-test-tool $(QUICKCHECK_TEST_TOOL_ARGS) # Run extra-tests in tests/extra/ subdirectory. diff --git a/inspector/Makefile.am b/inspector/Makefile.am index ce3aca94..3a1893d7 100644 --- a/inspector/Makefile.am +++ b/inspector/Makefile.am @@ -104,22 +104,22 @@ endif example-debian.xml: rm -f $@ $@-t - ../run --test \ + $(top_builddir)/run --test \ $(builddir)/virt-inspector ../tests/guests/debian.img > $@-t mv $@-t $@ example-fedora.xml: rm -f $@ $@-t - ../run --test \ + $(top_builddir)/run --test \ $(builddir)/virt-inspector ../tests/guests/fedora.img > $@-t mv $@-t $@ example-ubuntu.xml: rm -f $@ $@-t - ../run --test \ + $(top_builddir)/run --test \ $(builddir)/virt-inspector ../tests/guests/ubuntu.img > $@-t mv $@-t $@ example-windows.xml: rm -f $@ $@-t - ../run --test \ + $(top_builddir)/run --test \ $(builddir)/virt-inspector ../tests/guests/windows.img | \ fgrep -v '<uuid>' > $@-t mv $@-t $@ diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index e56a9718..c52a65fa 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -108,12 +108,12 @@ stamp-virt-sysprep.pod: virt-sysprep.pod sysprep-extra-options.pod sysprep-opera sysprep-extra-options.pod: virt-sysprep rm -f $@ $@-t - ../run ./$< --dump-pod-options > $@-t + $(top_builddir)/run ./$< --dump-pod-options > $@-t mv $@-t $@ sysprep-operations.pod: virt-sysprep rm -f $@ $@-t - ../run ./$< --dump-pod > $@-t + $(top_builddir)/run ./$< --dump-pod > $@-t mv $@-t $@ # Tests. diff --git a/tests/guests/Makefile.am b/tests/guests/Makefile.am index ff983ff9..21311dea 100644 --- a/tests/guests/Makefile.am +++ b/tests/guests/Makefile.am @@ -49,7 +49,7 @@ fedora.img: guest-aux/make-fedora-img.pl \ TMPDIR=$(top_builddir) \ SRCDIR=$(srcdir) \ LAYOUT=partitions \ - ../../run --test $< + $(top_builddir)/run --test $< # Make a (dummy) Fedora image using md devices fedora-md1.img fedora-md2.img: stamp-fedora-md.img @@ -61,7 +61,7 @@ stamp-fedora-md.img: guest-aux/make-fedora-img.pl \ TMPDIR=$(top_builddir) \ SRCDIR=$(srcdir) \ LAYOUT=partitions-md \ - ../../run --test $< + $(top_builddir)/run --test $< touch $@ guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt |