diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-09-19 13:07:51 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-09-19 13:07:51 +0400 |
| commit | ede2edd19b1baf4e8677f8bdc7e853c05eb5a4d5 (patch) | |
| tree | 46e87f02d924b89bde60832867a57dd1b082b48a /mysql-test | |
| parent | e60ff2b6a30f207f18760ca9a0de444110e800f5 (diff) | |
| parent | 19d0529819c65dc4662b6a388fea7fbc7323b2f1 (diff) | |
| download | mariadb-git-ede2edd19b1baf4e8677f8bdc7e853c05eb5a4d5.tar.gz | |
Merge from mysql-5.1.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/Makefile.am | 3 | ||||
| -rw-r--r-- | mysql-test/lib/My/SafeProcess/Makefile.am | 3 |
2 files changed, 4 insertions, 2 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 \ 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 |