diff options
Diffstat (limited to 'netware')
| -rwxr-xr-x | netware/BUILD/compile-netware-END | 9 | ||||
| -rwxr-xr-x | netware/BUILD/mwenv | 10 |
2 files changed, 15 insertions, 4 deletions
diff --git a/netware/BUILD/compile-netware-END b/netware/BUILD/compile-netware-END index a8d829499bd..6c531ab5c7c 100755 --- a/netware/BUILD/compile-netware-END +++ b/netware/BUILD/compile-netware-END @@ -18,8 +18,13 @@ rm -rf Makefile.in.bk # Setup Metrowerks environment . $path/mwenv -# Run autotools(use BUILD/autorun.sh) -. BUILD/autorun.sh +# Temporary hack to allow building from source dist +if [ ! "$USER"=pushbuild ] +then + # Run autotools(use BUILD/autorun.sh) + echo "Running autotools again(BUILD/autorun.sh)" + . BUILD/autorun.sh +fi # configure ./configure $base_configs $extra_configs diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv index c3869d2ec90..25144b58921 100755 --- a/netware/BUILD/mwenv +++ b/netware/BUILD/mwenv @@ -27,8 +27,8 @@ WINE_BUILD_DIR="$base/$WINE_BUILD_DIR" echo "WINE_BUILD_DIR: $WINE_BUILD_DIR" # Look for libc, MySQL 5.1.x uses libc-2006 by default -libcdir="$MYDEV/libc-2006" -if test ! -d $libcdir +libc_dir="$MYDEV/libc-2006" +if [ ! -d `winepath $libc_dir` ] then # The libcdir didn't exist, set default libc_dir="$MYDEV/libc" @@ -65,5 +65,11 @@ 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 |