diff options
Diffstat (limited to 'netware/BUILD/mwenv')
-rwxr-xr-x | netware/BUILD/mwenv | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv index f43092492bb..44497c48917 100755 --- a/netware/BUILD/mwenv +++ b/netware/BUILD/mwenv @@ -26,8 +26,17 @@ WINE_BUILD_DIR=`echo "$BUILD_DIR" | sed 's_'$base_unix_part'/__'` WINE_BUILD_DIR="$base/$WINE_BUILD_DIR" echo "WINE_BUILD_DIR: $WINE_BUILD_DIR" -export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.2.3;$WINE_BUILD_DIR/include;$MYDEV" -export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.2.3;$MYDEV/openssl;$WINE_BUILD_DIR/netware/BUILD" +# Look for libc, MySQL 5.1.x uses libc-2006 by default +libc_dir="$MYDEV/libc-2006" +if [ ! -d `winepath $libc_dir` ] +then + # The libcdir didn't exist, set default + libc_dir="$MYDEV/libc" +fi +echo "Using libc in $libc_dir"; + +export MWCNWx86Includes="$libc_dir/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.2.3;$WINE_BUILD_DIR/include;$MYDEV" +export MWNWx86Libraries="$libc_dir/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.2.3;$MYDEV/openssl;$WINE_BUILD_DIR/netware/BUILD" export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a;neb.imp;zPublics.imp;knetware.imp" export WINEPATH="$MYDEV/mw/bin" @@ -46,3 +55,21 @@ export LD='mwldnlm' export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption' export RANLIB=: export STRIP=: + +# +# Check that TERM has been set to avoid problem "Error opening +# terminal: unknown" when the script is executed using non interactive ssh +# +if test -z "$TERM" -o "$TERM"=dumb +then + export TERM=linux +fi + +# Temporary hack to allow building from source dist +if [ "$USER"=pushbuild ] +then + export ARFLAGS=$AR_FLAGS +fi + +# Print all env. variables +export |