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

diff --git a/simulate-sparky4-watcom-env.sh b/simulate-sparky4-watcom-env.sh
index ca40cbc6..4b28a4f1 100644
--- a/simulate-sparky4-watcom-env.sh
+++ b/simulate-sparky4-watcom-env.sh
@@ -6,8 +6,17 @@
 #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
@@ -30,7 +39,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}