database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

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

Browse Source 
post-push fix: make it work in out-of-source builds.
This commit is contained in:
Tor Didriksen
2011-02-16 13:44:28 +01:00
parent 3e3fd17cd7
commit 749945c1fd
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/mysql-test-run.pl
View File

@@ -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;

2
mysql-test/t/file_contents.test
View File

@@ -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|;