summaryrefslogtreecommitdiff
path: root/mysql-test/Makefile.am
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@sun.com>2009-10-19 12:09:52 +0200
committerMattias Jonsson <mattias.jonsson@sun.com>2009-10-19 12:09:52 +0200
commit93e02adcfab140265d3baf2062057826b3a28bc2 (patch)
tree11acbcf83ba9f40be4d590a80de9558743535f17 /mysql-test/Makefile.am
parent6e7a37d3e8fc1f32c382dae143eb091be1eb1e8f (diff)
parentdf129b749d609b75077ab7d60d65d40ff77b8299 (diff)
downloadmariadb-git-93e02adcfab140265d3baf2062057826b3a28bc2.tar.gz
Manual merge mysql-trunk -> mysql-trunk-wl3352
Diffstat (limited to 'mysql-test/Makefile.am')
-rw-r--r--mysql-test/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 810bead1adc..b1d0e85c70e 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -17,7 +17,8 @@
## Process this file with automake to create Makefile.in
-testdir = $(prefix)/mysql-test
+testroot = $(prefix)
+testdir = $(testroot)/mysql-test
test_SCRIPTS = mtr \
mysql-test-run \