From 64ad50893739ea279bcc30b7f00200d91a4e1391 Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Sat, 30 Mar 2002 00:53:14 +0000
Subject: [PATCH] oops

---
 dtool/pptempl/Global.gmsvc.pp   | 2 +-
 dtool/pptempl/Global.msvc.pp    | 2 +-
 dtool/pptempl/Template.gmsvc.pp | 4 ++--
 dtool/pptempl/Template.msvc.pp  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dtool/pptempl/Global.gmsvc.pp b/dtool/pptempl/Global.gmsvc.pp
index 2fc3429f4c..474fb2fc06 100644
--- a/dtool/pptempl/Global.gmsvc.pp
+++ b/dtool/pptempl/Global.gmsvc.pp
@@ -173,7 +173,7 @@
 #defer STATIC_LIB_C++ $[STATIC_LIB_C]
 
 // if we're attached, use dllbase.txt.  otherwise let OS loader resolve dll addrspace collisions
-#if $[ne $[DTOOL_INSTALL],]
+#if $[ne $[DTOOL],]
 // use predefined bases to speed dll loading and simplify debugging
 #defer DLLNAMEBASE lib$[TARGET]$[dllext]
 #defer DLLBASEADDRFILENAME dllbase.txt
diff --git a/dtool/pptempl/Global.msvc.pp b/dtool/pptempl/Global.msvc.pp
index e94ec408df..38e8c6aa51 100644
--- a/dtool/pptempl/Global.msvc.pp
+++ b/dtool/pptempl/Global.msvc.pp
@@ -148,7 +148,7 @@
 #defer STATIC_LIB_C++ $[STATIC_LIB_C]
 
 // if we're attached, use dllbase.txt.  otherwise let OS loader resolve dll addrspace collisions
-#if $[ne $[DTOOL_INSTALL],]
+#if $[ne $[DTOOL],]
 // use predefined bases to speed dll loading and simplify debugging
 #defer DLLNAMEBASE lib$[TARGET]$[dllext]
 #defer DLLBASEADDRFILENAME dllbase.txt
diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp
index c1a907c370..ff7fb966a1 100644
--- a/dtool/pptempl/Template.gmsvc.pp
+++ b/dtool/pptempl/Template.gmsvc.pp
@@ -33,8 +33,8 @@
   #end file
 #end decygwin
 
-#if $[ne $[DTOOL_INSTALL],]
-#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase
+#if $[ne $[DTOOL],]
+#define dtool_ver_dir_cyg $[DTOOL]/src/dtoolbase
 #define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]]
 #endif
 
diff --git a/dtool/pptempl/Template.msvc.pp b/dtool/pptempl/Template.msvc.pp
index e343ee94fa..4c7d0323ce 100644
--- a/dtool/pptempl/Template.msvc.pp
+++ b/dtool/pptempl/Template.msvc.pp
@@ -38,8 +38,8 @@
 // should overwrite read-only files
 #define NT_COPYCMD xcopy /Y /Q /R 
 
-#if $[ne $[DTOOL_INSTALL],]
-#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase
+#if $[ne $[DTOOL],]
+#define dtool_ver_dir_cyg $[DTOOL]/src/dtoolbase
 #define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]]
 #endif