explain what currently has no effect. sparky4 may have future plans

[16.git] / simulate-sparky4-watcom-env.sh

diff --git a/simulate-sparky4-watcom-env.sh b/simulate-sparky4-watcom-env.sh
index 4392dcf0d9428611eb0995cf92294797acdf4585..a913c29200958ac6bfbb2c63b762b44578ab0db1 100644 (file)
--- a/simulate-sparky4-watcom-env.sh
+++ b/simulate-sparky4-watcom-env.sh
@@ -22,7 +22,8 @@ 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
@@ -39,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}