Commit 50e159ff authored by Tor Didriksen's avatar Tor Didriksen

Bug #11751935 42969: PLEASE ADD A MANIFEST TO EACH BUILD

post-push fix: make it work in out-of-source builds.

mysql-test/mysql-test-run.pl:
  Set MYSQL_BINDIR, to be used by tests.
mysql-test/t/file_contents.test:
  Use MYSQL_BINDIR, which is different from MYSQL_LIBDIR for out-of-source builds.
parent 8cdb4097
...@@ -2160,6 +2160,7 @@ sub environment_setup { ...@@ -2160,6 +2160,7 @@ sub environment_setup {
$ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir; $ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir;
$ENV{'MYSQLTEST_VARDIR'}= $opt_vardir; $ENV{'MYSQLTEST_VARDIR'}= $opt_vardir;
$ENV{'MYSQL_LIBDIR'}= "$basedir/lib"; $ENV{'MYSQL_LIBDIR'}= "$basedir/lib";
$ENV{'MYSQL_BINDIR'}= "$bindir";
$ENV{'MYSQL_SHAREDIR'}= $path_language; $ENV{'MYSQL_SHAREDIR'}= $path_language;
$ENV{'MYSQL_CHARSETSDIR'}= $path_charsetsdir; $ENV{'MYSQL_CHARSETSDIR'}= $path_charsetsdir;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
--perl --perl
print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n"; print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
$dir_docs = $ENV{'MYSQL_LIBDIR'}; $dir_docs = $ENV{'MYSQL_BINDIR'};
if($dir_docs =~ m|/usr/|) { if($dir_docs =~ m|/usr/|) {
# RPM package # RPM package
$dir_docs =~ s|/lib|/share/doc|; $dir_docs =~ s|/lib|/share/doc|;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment