#echo Open Watcom Build Environment
ROOT=/home/sparky4/p/osfree
watcomver=""
-watcom=/dos/fdos/watcom${watcomver}
-WATCOM=$watcom
+
+if [ -d /usr/src/open-watcom-v2/rel ]; then
+ # Jon's Linux system
+ watcom=/usr/src/open-watcom-v2/rel
+ WATCOM=$watcom
+else
+ # original sparky4 config
+ watcom=/dos/fdos/watcom${watcomver}
+ WATCOM=$watcom
+fi
+
OS=LINUX
ENV=LINUX
SHELL=Bourne
WIPFC=$watcom/wipfc
LIB=$watcom/lib286/dos:$watcom/lib386:$watcom/lib386/dos:$watcom/lib286:$ROOT/lib
export OS REXX WATCOM ROOT TOOLS INCLUDE LIB WIPFC
-. ~/setvars.sh
+
+if [ -d /usr/src/open-watcom-v2/rel ]; then
+ # Jon's Linux system
+ cur=`pwd`
+ cd $WATCOM/.. || exit 1
+ . ./setvars.sh
+ cd "$cur" || exit 1
+else
+ # original sparky4 config
+ . ~/setvars.sh
+fi
+
PATH=$watcom/binl${PEE}:$TOOLS:$ROOT:$PATH
WD_PATH=$watcom/binl${PEE}