[Libguestfs] [PATCH 03/13] syntax-check: fix makefile_at_at_check

Hu Tao
2014-09-23T09:20:29Z

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
---
 align/Makefile.am                |  2 +-
 builder/Makefile.am              |  2 +-
 builder/website/Makefile.am      |  2 +-
 cat/Makefile.am                  |  4 ++--
 common-rules.mk                  |  8 ++++----
 customize/Makefile.am            |  2 +-
 df/Makefile.am                   |  4 ++--
 diff/Makefile.am                 |  2 +-
 erlang/examples/Makefile.am      |  4 ++--
 examples/Makefile.am             | 16 ++++++++--------
 fish/Makefile.am                 |  2 +-
 format/Makefile.am               |  2 +-
 golang/examples/Makefile.am      |  4 ++--
 inspector/Makefile.am            |  4 ++--
 java/examples/Makefile.am        |  4 ++--
 lua/Makefile.am                  |  2 +-
 lua/examples/Makefile.am         |  4 ++--
 make-fs/Makefile.am              |  2 +-
 mllib/Makefile.am                |  2 +-
 ocaml/Makefile.am                |  2 +-
 ocaml/examples/Makefile.am       |  4 ++--
 perl/examples/Makefile.am        |  4 ++--
 python/examples/Makefile.am      |  4 ++--
 rescue/Makefile.am               |  2 +-
 resize/Makefile.am               |  2 +-
 ruby/examples/Makefile.am        |  4 ++--
 sparsify/Makefile.am             |  2 +-
 src/Makefile.am                  |  2 +-
 sysprep/Makefile.am              |  4 ++--
 test-tool/Makefile.am            |  2 +-
 tests/c-api/Makefile.am          |  2 +-
 tests/fuzz/Makefile.am           |  2 +-
 tests/mount-local/Makefile.am    |  2 +-
 tests/parallel/Makefile.am       |  2 +-
 tests/relative-paths/Makefile.am |  2 +-
 v2v/Makefile.am                  |  2 +-
 36 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/align/Makefile.am b/align/Makefile.am
index 4ecbf7e..ed59c7a 100644
--- a/align/Makefile.am
+++ b/align/Makefile.am
@@ -98,4 +98,4 @@ TESTS += \
 endif

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check
diff --git a/builder/Makefile.am b/builder/Makefile.am
index eb6295a..843bac1 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -245,7 +245,7 @@ TESTS += test-virt-builder.sh
 endif ENABLE_APPLIANCE

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check

 check-slow:
 	$(MAKE) TESTS="test-virt-builder-planner.sh" check
diff --git a/builder/website/Makefile.am b/builder/website/Makefile.am
index a2d29df..967a4fb 100644
--- a/builder/website/Makefile.am
+++ b/builder/website/Makefile.am
@@ -41,4 +41,4 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test
 TESTS = validate.sh

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check
diff --git a/cat/Makefile.am b/cat/Makefile.am
index 14b8e81..8165589 100644
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -198,9 +198,9 @@ TESTS = \
 endif ENABLE_APPLIANCE

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check

 check-valgrind-local-guests:
 	for g in $(GUESTS); do \
-	  $(top_builddir)/run --test @VG@ ./virt-filesystems -c
"$(libvirt_ro_uri)" -d "$$g" --all --long -h --uuid || exit
$$?; \
+	  $(top_builddir)/run --test $(VG) ./virt-filesystems -c
"$(libvirt_ro_uri)" -d "$$g" --all --long -h --uuid || exit
$$?; \
 	done
diff --git a/common-rules.mk b/common-rules.mk
index 312107e..abee902 100644
--- a/common-rules.mk
+++ b/common-rules.mk
@@ -23,7 +23,7 @@
 # Old RHEL 5 autoconf defines these, but RHEL 5 automake doesn't
 # create variables for them.  So define them here if they're not
 # defined already.
-builddir     ?= @builddir@
-abs_builddir ?= @abs_builddir@
-srcdir       ?= @srcdir@
-abs_srcdir   ?= @abs_srcdir@
+builddir     ?= $(builddir)
+abs_builddir ?= $(abs_builddir)
+srcdir       ?= $(srcdir)
+abs_srcdir   ?= $(abs_srcdir)
diff --git a/customize/Makefile.am b/customize/Makefile.am
index 746375d..0f2571b 100644
--- a/customize/Makefile.am
+++ b/customize/Makefile.am
@@ -182,7 +182,7 @@ TESTS = test-virt-customize.sh
 endif

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check

 # Dependencies.
 depend: .depend
diff --git a/df/Makefile.am b/df/Makefile.am
index 29e0bf5..e6ab953 100644
--- a/df/Makefile.am
+++ b/df/Makefile.am
@@ -101,7 +101,7 @@ TESTS += \
 endif ENABLE_APPLIANCE

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check

 check-valgrind-local-guests:
-	$(top_builddir)/run --test @VG@ ./virt-df -c "$(libvirt_ro_uri)"
+	$(top_builddir)/run --test $(VG) ./virt-df -c "$(libvirt_ro_uri)"
diff --git a/diff/Makefile.am b/diff/Makefile.am
index 3c2c211..2735626 100644
--- a/diff/Makefile.am
+++ b/diff/Makefile.am
@@ -84,4 +84,4 @@ TESTS = \
 endif ENABLE_APPLIANCE

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check
diff --git a/erlang/examples/Makefile.am b/erlang/examples/Makefile.am
index 92e2c2d..c803d2c 100644
--- a/erlang/examples/Makefile.am
+++ b/erlang/examples/Makefile.am
@@ -35,8 +35,8 @@ stamp-guestfs-erlang.pod: guestfs-erlang.pod create_disk.erl
inspect_vm.erl
 	  --section 3 \
 	  --man guestfs-erlang.3 \
 	  --html $(top_builddir)/html/guestfs-erlang.3.html \
-	  --verbatim $(srcdir)/create_disk.erl:@EXAMPLE1@ \
-	  --verbatim $(srcdir)/inspect_vm.erl:@EXAMPLE2@ \
+	  --verbatim $(srcdir)/create_disk.erl:$(EXAMPLE1) \
+	  --verbatim $(srcdir)/inspect_vm.erl:$(EXAMPLE2) \
 	  --license examples \
 	  $<
 	touch $@
diff --git a/examples/Makefile.am b/examples/Makefile.am
index e150a58..70363af 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -159,14 +159,14 @@ stamp-guestfs-examples.pod: guestfs-examples.pod
copy-over.c create-disk.c debug
 	  --section 3 \
 	  --man guestfs-examples.3 \
 	  --html $(top_builddir)/html/guestfs-examples.3.html \
-	  --verbatim $(srcdir)/copy-over.c:@COPY_OVER@ \
-	  --verbatim $(srcdir)/create-disk.c:@CREATE_DISK@ \
-	  --verbatim $(srcdir)/debug-logging.c:@DEBUG_LOGGING@ \
-	  --verbatim $(srcdir)/display-icon.c:@DISPLAY_ICON@ \
-	  --verbatim $(srcdir)/inspect-vm.c:@INSPECT_VM@ \
-	  --verbatim $(srcdir)/libvirt-auth.c:@LIBVIRT_AUTH@ \
-	  --verbatim $(srcdir)/mount-local.c:@MOUNT_LOCAL@ \
-	  --verbatim $(srcdir)/virt-dhcp-address.c:@VIRT_DHCP_ADDRESS@ \
+	  --verbatim $(srcdir)/copy-over.c:$(COPY_OVER) \
+	  --verbatim $(srcdir)/create-disk.c:$(CREATE_DISK) \
+	  --verbatim $(srcdir)/debug-logging.c:$(DEBUG_LOGGING) \
+	  --verbatim $(srcdir)/display-icon.c:$(DISPLAY_ICON) \
+	  --verbatim $(srcdir)/inspect-vm.c:$(INSPECT_VM) \
+	  --verbatim $(srcdir)/libvirt-auth.c:$(LIBVIRT_AUTH) \
+	  --verbatim $(srcdir)/mount-local.c:$(MOUNT_LOCAL) \
+	  --verbatim $(srcdir)/virt-dhcp-address.c:$(VIRT_DHCP_ADDRESS) \
 	  --license examples \
 	  $<
 	touch $@
diff --git a/fish/Makefile.am b/fish/Makefile.am
index d28a94b..12909d1 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -297,7 +297,7 @@ TESTS += \
 endif

 check-valgrind:
-	$(MAKE) TESTS="test-a.sh test-add-domain.sh test-add-uri.sh test-copy.sh
test-d.sh test-edit.sh test-escapes.sh test-events.sh test-find0.sh test-glob.sh
test-inspect.sh test-prep.sh test-read-file.sh test-remote.sh
test-remote-events.sh test-reopen.sh test-run.sh test-stringlist.sh
test-tilde.sh test-upload-to-dir.sh" VG="$(top_builddir)/run
@VG@" check
+	$(MAKE) TESTS="test-a.sh test-add-domain.sh test-add-uri.sh test-copy.sh
test-d.sh test-edit.sh test-escapes.sh test-events.sh test-find0.sh test-glob.sh
test-inspect.sh test-prep.sh test-read-file.sh test-remote.sh
test-remote-events.sh test-reopen.sh test-run.sh test-stringlist.sh
test-tilde.sh test-upload-to-dir.sh" VG="$(top_builddir)/run
$(VG)" check

 EXTRA_DIST += \
 	test-a.sh \
diff --git a/format/Makefile.am b/format/Makefile.am
index 178c391..d7e8eeb 100644
--- a/format/Makefile.am
+++ b/format/Makefile.am
@@ -82,6 +82,6 @@ TESTS = test-virt-format.sh
 endif ENABLE_APPLIANCE

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check

 EXTRA_DIST += test-virt-format.sh
diff --git a/golang/examples/Makefile.am b/golang/examples/Makefile.am
index b5093ef..39ca35b 100644
--- a/golang/examples/Makefile.am
+++ b/golang/examples/Makefile.am
@@ -35,8 +35,8 @@ stamp-guestfs-golang.pod: guestfs-golang.pod create-disk.go
inspect-vm.go
 	  --section 3 \
 	  --man guestfs-golang.3 \
 	  --html $(top_builddir)/html/guestfs-golang.3.html \
-	  --verbatim $(srcdir)/create-disk.go:@EXAMPLE1@ \
-	  --verbatim $(srcdir)/inspect-vm.go:@EXAMPLE2@ \
+	  --verbatim $(srcdir)/create-disk.go:$(EXAMPLE1) \
+	  --verbatim $(srcdir)/inspect-vm.go:$(EXAMPLE2) \
 	  --license examples \
 	  $<
 	touch $@
diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 86e0cd7..d383d8d 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -107,9 +107,9 @@ TESTS += test-xmllint.sh
 endif

 check-valgrind:
-	$(MAKE) TESTS="test-virt-inspector.sh" VG="$(top_builddir)/run
@VG@" check
+	$(MAKE) TESTS="test-virt-inspector.sh" VG="$(top_builddir)/run
$(VG)" check

 check-valgrind-local-guests:
 	for g in $(GUESTS); do \
-	  $(top_builddir)/run --test @VG@ ./virt-inspector -c
"$(libvirt_ro_uri)" -d "$$g" || exit $$?; \
+	  $(top_builddir)/run --test $(VG) ./virt-inspector -c
"$(libvirt_ro_uri)" -d "$$g" || exit $$?; \
 	done
diff --git a/java/examples/Makefile.am b/java/examples/Makefile.am
index f494190..e02cc94 100644
--- a/java/examples/Makefile.am
+++ b/java/examples/Makefile.am
@@ -37,8 +37,8 @@ stamp-guestfs-java.pod: guestfs-java.pod CreateDisk.java
InspectVM.java
 	  --section 3 \
 	  --man guestfs-java.3 \
 	  --html $(top_builddir)/html/guestfs-java.3.html \
-	  --verbatim $(srcdir)/CreateDisk.java:@EXAMPLE1@ \
-	  --verbatim $(srcdir)/InspectVM.java:@EXAMPLE2@ \
+	  --verbatim $(srcdir)/CreateDisk.java:$(EXAMPLE1) \
+	  --verbatim $(srcdir)/InspectVM.java:$(EXAMPLE2) \
 	  --license examples \
 	  $<
 	touch $@
diff --git a/lua/Makefile.am b/lua/Makefile.am
index 2833e20..a5ff65e 100644
--- a/lua/Makefile.am
+++ b/lua/Makefile.am
@@ -102,7 +102,7 @@ EXTRA_DIST += \
 # https://bugs.kde.org/show_bug.cgi?id=79362
 # http://valgrind.org/docs/manual/faq.html#faq.unhelpful
 #check-valgrind:
-#	$(MAKE) VG="@VG@" check
+#	$(MAKE) VG="$(VG)" check

 # Custom install rule.
 install-data-hook:
diff --git a/lua/examples/Makefile.am b/lua/examples/Makefile.am
index 93ba2c5..7751eb3 100644
--- a/lua/examples/Makefile.am
+++ b/lua/examples/Makefile.am
@@ -35,8 +35,8 @@ stamp-guestfs-lua.pod: guestfs-lua.pod create_disk.lua
inspect_vm.lua
 	  --section 3 \
 	  --man guestfs-lua.3 \
 	  --html $(top_builddir)/html/guestfs-lua.3.html \
-	  --verbatim $(srcdir)/create_disk.lua:@EXAMPLE1@ \
-	  --verbatim $(srcdir)/inspect_vm.lua:@EXAMPLE2@ \
+	  --verbatim $(srcdir)/create_disk.lua:$(EXAMPLE1) \
+	  --verbatim $(srcdir)/inspect_vm.lua:$(EXAMPLE2) \
 	  --license examples \
 	  $<
 	touch $@
diff --git a/make-fs/Makefile.am b/make-fs/Makefile.am
index 03e30ba..45d021b 100644
--- a/make-fs/Makefile.am
+++ b/make-fs/Makefile.am
@@ -78,4 +78,4 @@ TESTS = \
 endif ENABLE_APPLIANCE

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check
diff --git a/mllib/Makefile.am b/mllib/Makefile.am
index 210fc64..8aa74dd 100644
--- a/mllib/Makefile.am
+++ b/mllib/Makefile.am
@@ -162,7 +162,7 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test
 TESTS = common_utils_tests

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check

 # Dependencies.
 depend: .depend
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 94f11ef..23c66c4 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -153,7 +153,7 @@ if HAVE_OCAMLOPT
 endif

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check

 # Dependencies.
 %.cmi: %.mli
diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am
index de647fc..b3bfdb5 100644
--- a/ocaml/examples/Makefile.am
+++ b/ocaml/examples/Makefile.am
@@ -37,8 +37,8 @@ stamp-guestfs-ocaml.pod: guestfs-ocaml.pod create_disk.ml
inspect_vm.ml
 	  --section 3 \
 	  --man guestfs-ocaml.3 \
 	  --html $(top_builddir)/html/guestfs-ocaml.3.html \
-	  --verbatim $(srcdir)/create_disk.ml:@EXAMPLE1@ \
-	  --verbatim $(srcdir)/inspect_vm.ml:@EXAMPLE2@ \
+	  --verbatim $(srcdir)/create_disk.ml:$(EXAMPLE1) \
+	  --verbatim $(srcdir)/inspect_vm.ml:$(EXAMPLE2) \
 	  --license examples \
 	  $<
 	touch $@
diff --git a/perl/examples/Makefile.am b/perl/examples/Makefile.am
index 9b04123..349525b 100644
--- a/perl/examples/Makefile.am
+++ b/perl/examples/Makefile.am
@@ -35,8 +35,8 @@ stamp-guestfs-perl.pod: guestfs-perl.pod create_disk.pl
inspect_vm.pl
 	  --section 3 \
 	  --man guestfs-perl.3 \
 	  --html $(top_builddir)/html/guestfs-perl.3.html \
-	  --verbatim $(srcdir)/create_disk.pl:@EXAMPLE1@ \
-	  --verbatim $(srcdir)/inspect_vm.pl:@EXAMPLE2@ \
+	  --verbatim $(srcdir)/create_disk.pl:$(EXAMPLE1) \
+	  --verbatim $(srcdir)/inspect_vm.pl:$(EXAMPLE2) \
 	  --license examples \
 	  $<
 	touch $@
diff --git a/python/examples/Makefile.am b/python/examples/Makefile.am
index 008a668..b15b65c 100644
--- a/python/examples/Makefile.am
+++ b/python/examples/Makefile.am
@@ -35,8 +35,8 @@ stamp-guestfs-python.pod: guestfs-python.pod create_disk.py
inspect_vm.py
 	  --section 3 \
 	  --man guestfs-python.3 \
 	  --html $(top_builddir)/html/guestfs-python.3.html \
-	  --verbatim $(srcdir)/create_disk.py:@EXAMPLE1@ \
-	  --verbatim $(srcdir)/inspect_vm.py:@EXAMPLE2@ \
+	  --verbatim $(srcdir)/create_disk.py:$(EXAMPLE1) \
+	  --verbatim $(srcdir)/inspect_vm.py:$(EXAMPLE2) \
 	  --license examples \
 	  $<
 	touch $@
diff --git a/rescue/Makefile.am b/rescue/Makefile.am
index 505b327..5394172 100644
--- a/rescue/Makefile.am
+++ b/rescue/Makefile.am
@@ -88,4 +88,4 @@ TESTS += \
 endif ENABLE_APPLIANCE

 check-valgrind:
-	$(MAKE) TESTS="test-virt-rescue-suggest.sh"
VG="$(top_builddir)/run @VG@" check
+	$(MAKE) TESTS="test-virt-rescue-suggest.sh"
VG="$(top_builddir)/run $(VG)" check
diff --git a/resize/Makefile.am b/resize/Makefile.am
index d1bc46f..eb21e0c 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -140,7 +140,7 @@ TESTS += test-virt-resize.sh
 endif

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check

 # Dependencies.
 depend: .depend
diff --git a/ruby/examples/Makefile.am b/ruby/examples/Makefile.am
index 1329a2a..c3b7d74 100644
--- a/ruby/examples/Makefile.am
+++ b/ruby/examples/Makefile.am
@@ -35,8 +35,8 @@ stamp-guestfs-ruby.pod: guestfs-ruby.pod create_disk.rb
inspect_vm.rb
 	  --section 3 \
 	  --man guestfs-ruby.3 \
 	  --html $(top_builddir)/html/guestfs-ruby.3.html \
-	  --verbatim $(srcdir)/create_disk.rb:@EXAMPLE1@ \
-	  --verbatim $(srcdir)/inspect_vm.rb:@EXAMPLE2@ \
+	  --verbatim $(srcdir)/create_disk.rb:$(EXAMPLE1) \
+	  --verbatim $(srcdir)/inspect_vm.rb:$(EXAMPLE2) \
 	  --license examples \
 	  $<
 	touch $@
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
index fc2777d..4657394 100644
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
@@ -129,7 +129,7 @@ TESTS = \
 endif ENABLE_APPLIANCE

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check

 # Dependencies.
 depend: .depend
diff --git a/src/Makefile.am b/src/Makefile.am
index 3d06203..4aeae5a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -268,7 +268,7 @@ test_utils_LDADD = \
 	$(top_builddir)/gnulib/lib/libgnu.la

 check-valgrind:
-	$(MAKE) VG="@VG@" check
+	$(MAKE) VG="$(VG)" check

 # Pkgconfig.

diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
index d6dae86..8d8a6f8 100644
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
@@ -215,11 +215,11 @@ TESTS = \
 endif ENABLE_APPLIANCE

 check-valgrind:
-	$(MAKE) TESTS="test-virt-sysprep.sh" VG="$(top_builddir)/run
@VG@" check
+	$(MAKE) TESTS="test-virt-sysprep.sh" VG="$(top_builddir)/run
$(VG)" check

 check-valgrind-local-guests:
 	for g in $(GUESTS); do \
-	  $(top_builddir)/run --test @VG@ ./virt-sysprep -n -c
"$(libvirt_ro_uri)" -d "$$g" || exit $$?; \
+	  $(top_builddir)/run --test $(VG) ./virt-sysprep -n -c
"$(libvirt_ro_uri)" -d "$$g" || exit $$?; \
 	done

 # Dependencies.
diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am
index c0e958c..86c34c5 100644
--- a/test-tool/Makefile.am
+++ b/test-tool/Makefile.am
@@ -50,4 +50,4 @@ stamp-libguestfs-test-tool.pod: libguestfs-test-tool.pod
 	touch $@

 check-valgrind:
-	$(top_builddir)/run --test @VG@ ./libguestfs-test-tool
+	$(top_builddir)/run --test $(VG) ./libguestfs-test-tool
diff --git a/tests/c-api/Makefile.am b/tests/c-api/Makefile.am
index 6ea22e9..4ad1692 100644
--- a/tests/c-api/Makefile.am
+++ b/tests/c-api/Makefile.am
@@ -229,4 +229,4 @@ test_event_string_LDADD = \
 #endif

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check
diff --git a/tests/fuzz/Makefile.am b/tests/fuzz/Makefile.am
index 67793d5..121e7a9 100644
--- a/tests/fuzz/Makefile.am
+++ b/tests/fuzz/Makefile.am
@@ -28,4 +28,4 @@ TESTS = \
 TESTS_ENVIRONMENT = $(top_builddir)/run --test $(VG)

 check-valgrind:
-	$(MAKE) VG="@VG@" check
+	$(MAKE) VG="$(VG)" check
diff --git a/tests/mount-local/Makefile.am b/tests/mount-local/Makefile.am
index 17cfa73..c521048 100644
--- a/tests/mount-local/Makefile.am
+++ b/tests/mount-local/Makefile.am
@@ -47,6 +47,6 @@ test_parallel_mount_local_LDADD = \
 	$(top_builddir)/gnulib/lib/libgnu.la

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check

 endif
diff --git a/tests/parallel/Makefile.am b/tests/parallel/Makefile.am
index be63256..b5f09ba 100644
--- a/tests/parallel/Makefile.am
+++ b/tests/parallel/Makefile.am
@@ -38,7 +38,7 @@ test_parallel_LDADD = \
 	$(top_builddir)/gnulib/lib/libgnu.la

 #check-valgrind:
-#	$(MAKE) VG="$(top_builddir)/run @VG@"
TESTS="test-parallel" check
+#	$(MAKE) VG="$(top_builddir)/run $(VG)"
TESTS="test-parallel" check

 check-slow:
 	$(MAKE) TESTS="test-parallel" check
diff --git a/tests/relative-paths/Makefile.am b/tests/relative-paths/Makefile.am
index beb60d9..3908cec 100644
--- a/tests/relative-paths/Makefile.am
+++ b/tests/relative-paths/Makefile.am
@@ -31,7 +31,7 @@ TESTS = \
 TESTS_ENVIRONMENT = $(top_builddir)/run --test

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check

 EXTRA_DIST = \
 	$(TESTS)
diff --git a/v2v/Makefile.am b/v2v/Makefile.am
index 4b57aca..00f788c 100644
--- a/v2v/Makefile.am
+++ b/v2v/Makefile.am
@@ -236,7 +236,7 @@ endif ENABLE_APPLIANCE
 check_DATA = test-v2v-networks-and-bridges.xml

 check-valgrind:
-	$(MAKE) VG="$(top_builddir)/run @VG@" check
+	$(MAKE) VG="$(top_builddir)/run $(VG)" check

 SLOW_TESTS = \
 	test-v2v-real-conversions.sh
--
1.9.3