X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=simulate-sparky4-watcom-env.sh;h=a913c29200958ac6bfbb2c63b762b44578ab0db1;hb=519a6668a2136256adb0faefedd356699443b538;hp=ca40cbc62a79a55eab3e13264e5d7d136c491b68;hpb=68ed07e129d9504e398bc771082352ee0f591d85;p=16.git

diff --git a/simulate-sparky4-watcom-env.sh b/simulate-sparky4-watcom-env.sh
index ca40cbc6..a913c292 100644
--- a/simulate-sparky4-watcom-env.sh
+++ b/simulate-sparky4-watcom-env.sh
@@ -6,14 +6,24 @@
 #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
 REXX=/usr/bin/rexx
 
-
+# use 64-bit Linux binaries on 64-bit.
+# NTS: watcomver is never set, therefore this currently has NO EFFECT.
 if [ "${watcomver}" == 2 ]; then
 	MACHINE_TYPE=`uname -m`
 	if [ ${MACHINE_TYPE} == 'x86_64' ]; then
@@ -30,7 +40,18 @@ INCLUDE=$watcom/h:$watcom/h/dos:$watcom/lh:$watcom/h/os2
 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}