summaryrefslogtreecommitdiff
path: root/mysql-test/lib
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2009-09-21 11:43:01 +0200
committerBjorn Munch <Bjorn.Munch@sun.com>2009-09-21 11:43:01 +0200
commitbb181d25cb152436294e1076e025fb1ea88d5e3a (patch)
tree51b119dc863987a2aa330eb68c0dc7a70cd993fd /mysql-test/lib
parent4a75d269cedf201a6a5f46a936c4db7c960f3be3 (diff)
parent18f7dd0fad8479007d9618bfd570be72cae90277 (diff)
downloadmariadb-git-bb181d25cb152436294e1076e025fb1ea88d5e3a.tar.gz
new merge from trunk
Diffstat (limited to 'mysql-test/lib')
-rw-r--r--mysql-test/lib/My/SafeProcess/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/lib/My/SafeProcess/Makefile.am b/mysql-test/lib/My/SafeProcess/Makefile.am
index 623c0e9a87a..722331453fe 100644
--- a/mysql-test/lib/My/SafeProcess/Makefile.am
+++ b/mysql-test/lib/My/SafeProcess/Makefile.am
@@ -13,7 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-safedir = $(prefix)/mysql-test/lib/My/SafeProcess
+testroot = $(prefix)
+safedir = $(testroot)/mysql-test/lib/My/SafeProcess
#nobase_bin_PROGRAMS = ...
safe_PROGRAMS = my_safe_process