.

32 files changed, 32 insertions, 32 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b46f6b826..c10ed030b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -279,7 +279,7 @@ TESTS = help-version
 TESTS_ENVIRONMENT = \
   all_programs="`$(all_programs)`" \
   PACKAGE_BUGREPORT=$(PACKAGE_BUGREPORT) \
-  PATH="`pwd`/../src/vg$(PATH_SEPARATOR)$$PATH"
+  PATH="`pwd`/../src$(PATH_SEPARATOR)$$PATH"
 
 EXTRA_DIST = \
   $(TESTS) .env-warn Fetish.pm Makefile.am.in README envvar-check \
diff --git a/tests/basename/Makefile.in b/tests/basename/Makefile.in
index ff61e27c8..27c42a2fc 100644
--- a/tests/basename/Makefile.in
+++ b/tests/basename/Makefile.in
@@ -263,7 +263,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=basename
 
 all: all-am
diff --git a/tests/chgrp/Makefile.in b/tests/chgrp/Makefile.in
index 44ac880a4..1a9e2276e 100644
--- a/tests/chgrp/Makefile.in
+++ b/tests/chgrp/Makefile.in
@@ -260,7 +260,7 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = no-x posix-H basic deref recurse
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 all: all-am
 
diff --git a/tests/chmod/Makefile.in b/tests/chmod/Makefile.in
index 64f87f486..02cfb6ff2 100644
--- a/tests/chmod/Makefile.in
+++ b/tests/chmod/Makefile.in
@@ -260,7 +260,7 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = no-x equals equal-x c-option setgid
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 all: all-am
 
diff --git a/tests/chown/Makefile.in b/tests/chown/Makefile.in
index 8d404aaf3..b4180c980 100644
--- a/tests/chown/Makefile.in
+++ b/tests/chown/Makefile.in
@@ -260,7 +260,7 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = basic
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 all: all-am
 
diff --git a/tests/cp/Makefile.in b/tests/cp/Makefile.in
index 0ea23169d..bf1cae14a 100644
--- a/tests/cp/Makefile.in
+++ b/tests/cp/Makefile.in
@@ -267,7 +267,7 @@ TESTS = \
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   MAKE=$(MAKE) \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 all: all-am
 
diff --git a/tests/dd/Makefile.in b/tests/dd/Makefile.in
index 2d07493a8..60de3c7b8 100644
--- a/tests/dd/Makefile.in
+++ b/tests/dd/Makefile.in
@@ -261,7 +261,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=dd
 
 TESTS = misc not-rewound skip-seek skip-seek2 unblock-sync
diff --git a/tests/dircolors/Makefile.in b/tests/dircolors/Makefile.in
index 4b453d40d..671f88c23 100644
--- a/tests/dircolors/Makefile.in
+++ b/tests/dircolors/Makefile.in
@@ -261,7 +261,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=dircolors
 
 TESTS = simple
diff --git a/tests/du/Makefile.in b/tests/du/Makefile.in
index d4d8d0412..1bbf133da 100644
--- a/tests/du/Makefile.in
+++ b/tests/du/Makefile.in
@@ -268,7 +268,7 @@ TESTS = \
 
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 all: all-am
 
diff --git a/tests/expr/Makefile.in b/tests/expr/Makefile.in
index 181d5e120..d5b524eec 100644
--- a/tests/expr/Makefile.in
+++ b/tests/expr/Makefile.in
@@ -263,7 +263,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=expr
 
 all: all-am
diff --git a/tests/factor/Makefile.in b/tests/factor/Makefile.in
index f3a8698b9..6a6231fc1 100644
--- a/tests/factor/Makefile.in
+++ b/tests/factor/Makefile.in
@@ -263,7 +263,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=factor
 
 all: all-am
diff --git a/tests/fmt/Makefile.in b/tests/fmt/Makefile.in
index 11252d259..5407f6d34 100644
--- a/tests/fmt/Makefile.in
+++ b/tests/fmt/Makefile.in
@@ -261,7 +261,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=fmt
 
 TESTS = basic long-line
diff --git a/tests/install/Makefile.in b/tests/install/Makefile.in
index 689b3f0a7..560b5a64f 100644
--- a/tests/install/Makefile.in
+++ b/tests/install/Makefile.in
@@ -260,7 +260,7 @@ AUTOMAKE_OPTIONS = 1.3 gnits
 TESTS = basic-1 create-leading
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 all: all-am
 
diff --git a/tests/ln/Makefile.in b/tests/ln/Makefile.in
index 1efd27e58..bd608e2fd 100644
--- a/tests/ln/Makefile.in
+++ b/tests/ln/Makefile.in
@@ -260,7 +260,7 @@ AUTOMAKE_OPTIONS = 1.2 gnits
 TESTS = target-1 sf-1 misc backup-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 all: all-am
 
diff --git a/tests/ls-2/Makefile.in b/tests/ls-2/Makefile.in
index 7018d0220..de90f4293 100644
--- a/tests/ls-2/Makefile.in
+++ b/tests/ls-2/Makefile.in
@@ -261,7 +261,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=ls
 
 TESTS = tests
diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in
index 25cefe800..55143276c 100644
--- a/tests/ls/Makefile.in
+++ b/tests/ls/Makefile.in
@@ -265,7 +265,7 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=ls
 
 all: all-am
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index 46bd0d056..f4aa4d269 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -261,7 +261,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=md5sum
 
 TESTS = basic-1 newline-1
diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in
index 62ee7f90a..8342c90d4 100644
--- a/tests/misc/Makefile.in
+++ b/tests/misc/Makefile.in
@@ -262,7 +262,7 @@ TESTS_ENVIRONMENT = \
   srcdir=$(srcdir) \
   PACKAGE_VERSION=$(PACKAGE_VERSION) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=$$tst
 
 TESTS = \
diff --git a/tests/mkdir/Makefile.in b/tests/mkdir/Makefile.in
index b0e97f948..a6e3c6db0 100644
--- a/tests/mkdir/Makefile.in
+++ b/tests/mkdir/Makefile.in
@@ -261,7 +261,7 @@ TESTS = p-1 p-2 special-1 perm parents t-slash
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   srcdir=$(srcdir) \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 all: all-am
 
diff --git a/tests/mv/Makefile.in b/tests/mv/Makefile.in
index 0aa824255..e0ec02757 100644
--- a/tests/mv/Makefile.in
+++ b/tests/mv/Makefile.in
@@ -274,7 +274,7 @@ TESTS = \
 EXTRA_DIST = $(TESTS) setup vfat
 TESTS_ENVIRONMENT = \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=mv
 
 all: all-am
diff --git a/tests/od/Makefile.in b/tests/od/Makefile.in
index 89d5e05bc..10f31e012 100644
--- a/tests/od/Makefile.in
+++ b/tests/od/Makefile.in
@@ -261,7 +261,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 TESTS = od-N x8
 all: all-am
diff --git a/tests/rm/Makefile.in b/tests/rm/Makefile.in
index 9e3f36126..28d289dc3 100644
--- a/tests/rm/Makefile.in
+++ b/tests/rm/Makefile.in
@@ -272,7 +272,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PACKAGE_VERSION=$(PACKAGE_VERSION) \
   PROG=rm
 
diff --git a/tests/rmdir/Makefile.in b/tests/rmdir/Makefile.in
index d717acddd..13340e8de 100644
--- a/tests/rmdir/Makefile.in
+++ b/tests/rmdir/Makefile.in
@@ -263,7 +263,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=rmdir
 
 all: all-am
diff --git a/tests/seq/Makefile.in b/tests/seq/Makefile.in
index feec658fe..ccf6790b7 100644
--- a/tests/seq/Makefile.in
+++ b/tests/seq/Makefile.in
@@ -263,7 +263,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=seq
 
 all: all-am
diff --git a/tests/sha1sum/Makefile.in b/tests/sha1sum/Makefile.in
index 9e2e3c18b..3f395c1b2 100644
--- a/tests/sha1sum/Makefile.in
+++ b/tests/sha1sum/Makefile.in
@@ -261,7 +261,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=sha1sum
 
 TESTS = basic-1 sample-vec
diff --git a/tests/shred/Makefile.in b/tests/shred/Makefile.in
index aa3ce051d..d05a7a845 100644
--- a/tests/shred/Makefile.in
+++ b/tests/shred/Makefile.in
@@ -261,7 +261,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 TESTS = remove exact
 all: all-am
diff --git a/tests/stty/Makefile.in b/tests/stty/Makefile.in
index 3ba77c59d..ea652856f 100644
--- a/tests/stty/Makefile.in
+++ b/tests/stty/Makefile.in
@@ -260,7 +260,7 @@ AUTOMAKE_OPTIONS = 1.2f gnits
 TESTS = row-col-1 basic-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 all: all-am
 
diff --git a/tests/sum/Makefile.in b/tests/sum/Makefile.in
index e063085b5..dcb6a7fb4 100644
--- a/tests/sum/Makefile.in
+++ b/tests/sum/Makefile.in
@@ -261,7 +261,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=sum
 
 TESTS = basic-1 sysv
diff --git a/tests/tail-2/Makefile.in b/tests/tail-2/Makefile.in
index ee3194e5a..feb9a3887 100644
--- a/tests/tail-2/Makefile.in
+++ b/tests/tail-2/Makefile.in
@@ -261,7 +261,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=tail
 
 TESTS = \
diff --git a/tests/touch/Makefile.in b/tests/touch/Makefile.in
index 6c58bbec4..590e82bc2 100644
--- a/tests/touch/Makefile.in
+++ b/tests/touch/Makefile.in
@@ -266,7 +266,7 @@ TESTS = \
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   host_triplet=$(host_triplet) \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 all: all-am
 
diff --git a/tests/tsort/Makefile.in b/tests/tsort/Makefile.in
index acc899646..f9aee7a5e 100644
--- a/tests/tsort/Makefile.in
+++ b/tests/tsort/Makefile.in
@@ -261,7 +261,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=tsort
 
 TESTS = basic-1
diff --git a/tests/unexpand/Makefile.in b/tests/unexpand/Makefile.in
index 6050be625..9d244ce1a 100644
--- a/tests/unexpand/Makefile.in
+++ b/tests/unexpand/Makefile.in
@@ -261,7 +261,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src/vg$(PATH_SEPARATOR)$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=unexpand
 
 TESTS = basic-1