oops

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

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

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
 

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