From 0c50b07bf55a89e6099c2f5322bb319c1ca4dbea Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Wed, 7 Nov 2001 21:45:29 +0000
Subject: [PATCH] update cygwin OS vars

---
 dtool/src/attach/dtool.alias |  2 +-
 dtool/src/attach/dtool.cshrc | 10 +++++-----
 dtool/src/attach/dtool.emacs |  4 +++-
 dtool/src/attach/dtool.sh    |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dtool/src/attach/dtool.alias b/dtool/src/attach/dtool.alias
index 441f757e6f..cfc3a5c7cc 100644
--- a/dtool/src/attach/dtool.alias
+++ b/dtool/src/attach/dtool.alias
@@ -26,7 +26,7 @@ alias ctuna 'ctunattach'
 
 #Modifications to emacs alias by Jason
 #To allow for NTEmacs to run like emacs on unix boxes
-if (($OS == "CYGWIN_NT-4.0") || ($OS == "CYGWIN_NT-5.0" )) then
+if (($OS == "CYGWIN_NT-4.0") || ($OS == "CYGWIN_NT-5.0" ) || ($OS == "CYGWIN_NT-5.1" )) then
   alias emacs 'emacs -T "`logname`@`uname -n`  $CTPROJS" -xrm "Emacs*iconName: `echo $CTPROJS | cut -f1 -d:`(`uname -n`)" -bg #002040 -fg #00C0FF -cr yellow -ms yellow -l `cygpath -w ~/.emacs` $CTEMACS_OPTS'
 else
   alias emacs 'emacs -T "`logname`@`uname -n`  $CTPROJS" -xrm "Emacs*iconName: `echo $CTPROJS | cut -f1 -d:`(`uname -n`)" $CTEMACS_OPTS'
diff --git a/dtool/src/attach/dtool.cshrc b/dtool/src/attach/dtool.cshrc
index 8531275b8c..2330a6e8f0 100644
--- a/dtool/src/attach/dtool.cshrc
+++ b/dtool/src/attach/dtool.cshrc
@@ -13,8 +13,8 @@ else if ( $OS == "IRIX64" ) then
              . /usr/sbin /usr/bsd /sbin /usr/bin /bin /usr/bin/X11 /usr/etc  \
              /usr/demos/bin /usr/local/bin )
   setenv LD_LIBRARY_PATH ".:/usr/local/lib"
-else if (( $OS == "CYGWIN_NT-4.0" ) || ( $OS == "WINNT" ) || ($OS == "CYGWIN_NT-5.0")) then
-  set path = ( /usr/local/bin /contrib/bin . /usr/lib $path )
+else if (($OS == "CYGWIN_NT-5.1") || ($OS == "CYGWIN_NT-5.0") || ( $OS == "CYGWIN_NT-4.0" ) || ( $OS == "WINNT" )) then
+  set path = ( /usr/local/bin /contrib/bin . /usr/lib /bin $path )
   if ( $?LIB ) then
     setenv LIB "$LIB;"`cygpath -w /usr/lib`
   else 
@@ -22,7 +22,7 @@ else if (( $OS == "CYGWIN_NT-4.0" ) || ( $OS == "WINNT" ) || ($OS == "CYGWIN_NT-
   endif
 else if (( $OS == "CYGWIN_98-4.10" ) || ( $OS == "WIN95" )) then
   set path = ( /bin /usr/local/bin /contrib/bin /msvc98/Bin \
-	/mscommon/MSDev98/Bin /mscommon/Tools . /usr/lib $path )
+        /mscommon/MSDev98/Bin /mscommon/Tools . /usr/lib $path )
   setenv LIB `cygpath -w /msvc98/mfc/lib`\;`cygpath -w /msvc98/lib`\;`cygpath -w /usr/lib`
   setenv INCLUDE `cygpath -w /msvc98/Include`
 else
@@ -36,7 +36,7 @@ if ( $OS == "Linux" ) then
 setenv MANPATH "/usr/local/man:/usr/man/preformat:/usr/man:/usr/X11R6/man"
 else if ( $OS == "IRIX64" ) then
 setenv MANPATH "/usr/share/catman:/usr/catman:/usr/local/share/catman:/usr/local/share/man:/usr/local/man"
-else if (( $OS == "CYGWIN_NT-4.0" ) || ( $OS == "CYGWIN_98-4.10" ) || ( $OS == "WIN95" ) || ( $OS == "WINNT" ) || ( $OS == "CYGWIN_NT-5.0")) then
+else if (( $OS == "CYGWIN_NT-5.1") || ( $OS == "CYGWIN_NT-5.0") || ( $OS == "CYGWIN_NT-4.0" ) || ( $OS == "CYGWIN_98-4.10" ) || ( $OS == "WIN95" )) then
 setenv MANPATH "/usr/man:/contrib/man"
 else
 setenv MANPATH "/usr/share/catman:/usr/catman:/usr/local/share/catman:/usr/local/share/man:/usr/local/man"
@@ -67,7 +67,7 @@ if ( ! $?PENV ) then
       setenv PENV "Linux"
    else if ( $OS == "IRIX64" ) then
       setenv PENV "SGI"
-   else if (( $OS == "CYGWIN_NT-4.0" ) || ( $OS == "CYGWIN_98-4.10" ) || ( $OS == "WIN95" ) || ( $OS == "CYGWIN_NT-5.0")) then
+   else if (( $OS == "CYGWIN_NT-5.1") || ( $OS == "CYGWIN_NT-5.0") || ( $OS == "CYGWIN_NT-4.0" ) || ( $OS == "CYGWIN_98-4.10" ) || ( $OS == "WIN95" )) then
       setenv PENV "WIN32"
    else
       setenv PENV "SGI"
diff --git a/dtool/src/attach/dtool.emacs b/dtool/src/attach/dtool.emacs
index c135f53f08..6b36dda04c 100644
--- a/dtool/src/attach/dtool.emacs
+++ b/dtool/src/attach/dtool.emacs
@@ -24,7 +24,9 @@
                    (if (string= h-a "yes") t '())))
 ;; (setq have-neartool (let ((h-n (getenv "HAVE_NEARTOOL")))
 ;;                          (if (string= h-n "yes") t '())))
-(setq is-cygwin (string= (getenv "OS") "CYGWIN_NT-4.0"))
+(setq is-cygwin (or (string= (getenv "OS") "CYGWIN_NT-4.0")
+                    (string= (getenv "OS") "CYGWIN_NT-5.0")
+                    (string= (getenv "OS") "CYGWIN_NT-5.1")))  
 
 ;; (setq ct-command (cond
 ;;                   (is-cygwin "bash /install/tool/bin/neartool")
diff --git a/dtool/src/attach/dtool.sh b/dtool/src/attach/dtool.sh
index fe9ca8a479..f739099267 100755
--- a/dtool/src/attach/dtool.sh
+++ b/dtool/src/attach/dtool.sh
@@ -9,7 +9,7 @@ if [ $OS = "Linux" ]; then
 elif [ $OS = "IRIX64" ]; then
   PATH=/var/local/bin:/usr/local/bin/ptools:~/bin:/usr/local/prman/bin:.:/usr/sbin:/usr/bsd:/sbin:/usr/bin:/bin:/usr/bin/X11:/usr/etc:/usr/demos/bin:/usr/local/bin
 elif [ $OS = "CYGWIN_98-4.10" ]; then
-  PATH=/usr/local/bin:/CYGNUS/CYGWIN~1/H-I586~1/BIN:/WINDOWS:/WINDOWS:/WINDOWS/COMMAND:/DMI/BIN:/KATANA/UTL/DEV/MAKE:/KATANA/UTL/DEV/HITACHI
+  PATH=/usr/local/bin:/bin:/CYGNUS/CYGWIN~1/H-I586~1/BIN:/WINDOWS:/WINDOWS:/WINDOWS/COMMAND:/DMI/BIN:/KATANA/UTL/DEV/MAKE:/KATANA/UTL/DEV/HITACHI
 else
   PATH=/var/local/bin:/usr/local/bin/ptools:~/bin:/usr/local/prman/bin:.:/usr/sbin:/usr/bsd:/sbin:/usr/bin:/bin:/usr/bin/X11:/usr/etc:/usr/demos/bin:/usr/local/bin
 fi