From 282d68f6e0c8b446884ecbda0bea679f8853f5d1 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@gmail.com>
Date: Tue, 27 Oct 2009 00:48:05 -0400
Subject: Fix tokenizer test in VPATH build.

---
 configure.ac                 | 1 +
 tests/dimension/Makefile.am  | 4 ++--
 tests/dimension/tokenizer.sh | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 703dba6..bee13fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,7 @@ AC_CONFIG_FILES([Makefile
                  dimension/Makefile
                  tests/Makefile
                  tests/libdimension/Makefile
+                 tests/dimension/Makefile
                  bench/Makefile
                  bench/libdimension/Makefile
                  doc/Makefile])
diff --git a/tests/dimension/Makefile.am b/tests/dimension/Makefile.am
index 89c228e..a85b4ac 100644
--- a/tests/dimension/Makefile.am
+++ b/tests/dimension/Makefile.am
@@ -19,7 +19,7 @@
 
 INCLUDES = -I$(top_srcdir)/libdimension
 
-TESTS = tokenizer.sh
-TESTS_ENVIRONMENT = TOP_BUILDDIR=$(top_builddir)
+TESTS = $(srcdir)/tokenizer.sh
+TESTS_ENVIRONMENT = top_builddir=$(top_builddir)
 
 EXTRA_DIST = braces.pov
diff --git a/tests/dimension/tokenizer.sh b/tests/dimension/tokenizer.sh
index 35bcf65..b6de05a 100755
--- a/tests/dimension/tokenizer.sh
+++ b/tests/dimension/tokenizer.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-braces=$(${TOP_BUILDDIR}/dimension/dimension --tokenize braces.pov)
+braces=$(${top_builddir}/dimension/dimension --tokenize ${srcdir}/braces.pov)
 braces_exp='({ { } } } } { {)'
 
 if [ "$braces" != "$braces_exp" ]; then
-- 
cgit v1.2.3