diff options
| author | greg@mysql.com <> | 2003-03-28 14:24:32 -0500 |
|---|---|---|
| committer | greg@mysql.com <> | 2003-03-28 14:24:32 -0500 |
| commit | 080b73ee188b7528cfbcb04cbe9d76a794031136 (patch) | |
| tree | e7d6d77bba01f8deac042852298bd68bae0527ad /netware | |
| parent | a83d0497d7b511f240df90a60a144b6c8485a917 (diff) | |
| download | mariadb-git-080b73ee188b7528cfbcb04cbe9d76a794031136.tar.gz | |
Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches
Diffstat (limited to 'netware')
| -rwxr-xr-x | netware/BUILD/mwenv | 6 | ||||
| -rw-r--r-- | netware/Makefile.am | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv index 26794c3f77f..27f7056d251 100755 --- a/netware/BUILD/mwenv +++ b/netware/BUILD/mwenv @@ -6,9 +6,9 @@ # the default is "F:/mydev" export MYDEV="WINE_BUILD_DIR" -export MWCNWx86Includes="$MYDEV/libc/include" -export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib" -export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib" +export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/zlib-1.1.4" +export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/zlib-1.1.4" +export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a" export WINEPATH="$MYDEV/mw/bin" diff --git a/netware/Makefile.am b/netware/Makefile.am index 801d144b968..6495f538ffb 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -29,7 +29,7 @@ netware_build_files = client/mysql.def client/mysqladmin.def \ extra/mysql_install.def extra/my_print_defaults.def \ extra/perror.def extra/replace.def \ extra/resolveip.def extra/comp_err.def \ - isam/isamchk.def \ + isam/isamchk.def \ isam/isamlog.def isam/pack_isam.def \ libmysqld/libmysqld.def myisam/myisamchk.def \ myisam/myisamlog.def myisam/myisampack.def \ |