diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-03-01 12:39:44 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-03-01 12:39:44 +0300 |
| commit | 1913b715bc6559d3c79f8eb9cddfd971fb1dd785 (patch) | |
| tree | c9c3978afa21ee1f05cc50ff5b86a8ab31ec80ee /mysql-test/Makefile.am | |
| parent | bf875901047faa8796aa0fe6a6bca32ea7fde956 (diff) | |
| parent | 031657c6943aab8109cd08321048ed1f3c943a34 (diff) | |
| download | mariadb-git-1913b715bc6559d3c79f8eb9cddfd971fb1dd785.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/share/Makefile.am
Diffstat (limited to 'mysql-test/Makefile.am')
| -rw-r--r-- | mysql-test/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index ebfef321db3..713751b9355 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -138,12 +138,12 @@ uninstall-local: # mtr - a shortcut for executing mysql-test-run.pl mtr: $(RM) -f mtr - $(LN_S) mysql-test-run.pl mtr + $(LN_S) $(srcdir)/mysql-test-run.pl mtr # mysql-test-run - a shortcut for executing mysql-test-run.pl mysql-test-run: $(RM) -f mysql-test-run - $(LN_S) mysql-test-run.pl mysql-test-run + $(LN_S) $(srcdir)/mysql-test-run.pl mysql-test-run # Don't update the files from bitkeeper %::SCCS/s.% |