Commit 22f0c934 authored by unknown's avatar unknown

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work

into  neptunus.(none):/home/msvensson/mysql/work/my51-work


netware/BUILD/mwenv:
  Auto merged
parents 6fcaf5f6 792b2b6b
...@@ -21,9 +21,9 @@ echo "BUILD_DIR: $BUILD_DIR" ...@@ -21,9 +21,9 @@ echo "BUILD_DIR: $BUILD_DIR"
# Get current dir in wine format # Get current dir in wine format
base=`echo $MYDEV |sed 's/\/.*//'` base=`echo $MYDEV |sed 's/\/.*//'`
base_unix_part=`winepath -- -u $base` base_unix_part=`winepath -- -u $base/`
WINE_BUILD_DIR=`echo "$BUILD_DIR" | sed 's_'$base_unix_part'/__'` WINE_BUILD_DIR=`echo "$BUILD_DIR" | sed 's_'$base_unix_part'/__'`
WINE_BUILD_DIR="$base$WINE_BUILD_DIR" WINE_BUILD_DIR="$base/$WINE_BUILD_DIR"
echo "WINE_BUILD_DIR: $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 MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.2.3;$WINE_BUILD_DIR/include;$MYDEV"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment