diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-06-06 17:59:00 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-06-06 17:59:00 +0300 |
| commit | 9d5e2e915a36677acf80fb1378ba45ff2b399c33 (patch) | |
| tree | 1bf6f5027024a88509b28da4ea44d61777a79710 /netware | |
| parent | 4e12564589a6c3c5342ff8219e8f0fb77395908e (diff) | |
| download | mariadb-git-9d5e2e915a36677acf80fb1378ba45ff2b399c33.tar.gz | |
Some fixes for Netware builds.
netware/BUILD/compile-linux-tools:
A patch for Netware builds. This fixes problem with missing mysql_version.h during Linux
tools building.
netware/BUILD/compile-netware-END:
A fix for Netware builds.
netware/BUILD/mwenv:
A fix for Netware builds, environment variables setup script.
Diffstat (limited to 'netware')
| -rwxr-xr-x | netware/BUILD/compile-linux-tools | 6 | ||||
| -rwxr-xr-x | netware/BUILD/compile-netware-END | 5 | ||||
| -rwxr-xr-x | netware/BUILD/mwenv | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/netware/BUILD/compile-linux-tools b/netware/BUILD/compile-linux-tools index c21857146e0..c85fced5739 100755 --- a/netware/BUILD/compile-linux-tools +++ b/netware/BUILD/compile-linux-tools @@ -30,6 +30,10 @@ rm -f */*.linux # build tools only make clean all-local + +# Create mysql_version.h which was deleted my previous step +./config.status include/mysql_version.h + (cd dbug; make libdbug.a) (cd strings; make libmystrings.a) (cd mysys; make libmysys.a) @@ -56,3 +60,5 @@ cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux cp sql/gen_lex_hash sql/gen_lex_hash.linux cp strings/conf_to_src strings/conf_to_src.linux +# Delete mysql_version.h +rm -f include/mysql_version.h diff --git a/netware/BUILD/compile-netware-END b/netware/BUILD/compile-netware-END index 2bd59f97114..60ef428b2a9 100755 --- a/netware/BUILD/compile-netware-END +++ b/netware/BUILD/compile-netware-END @@ -22,6 +22,11 @@ rm -rf Makefile.in.bk # run auto tools . $path/compile-AUTOTOOLS +# For NetWare there is no comp_err but comp_err.linux +sed -e "s/comp_err/comp_err.linux/g" extra/Makefile.am > extra/Makefile.am.$$ +sed -e "s/replace comp_err.linux/replace comp_err/g" extra/Makefile.am.$$ > extra/Makefile.am +rm extra/Makefile.am.$$ + # configure ./configure $base_configs $extra_configs diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv index 0acfd3aaf8f..99de5e9be1e 100755 --- a/netware/BUILD/mwenv +++ b/netware/BUILD/mwenv @@ -6,7 +6,7 @@ # the default is "F:/mydev" export MYDEV="F:/mydev" -export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.1.4;$MYDEV" +export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.1.4;$MYDEV/mysql-VERSION/include;$MYDEV" export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.1.4;$MYDEV/openssl;$MYDEV/mysql-VERSION/netware/BUILD" export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a;neb.imp;zPublics.imp;knetware.imp" |