diff --git a/direct/Package.pp b/direct/Package.pp
index 6280442d0e..6aee0aed85 100644
--- a/direct/Package.pp
+++ b/direct/Package.pp
@@ -34,7 +34,7 @@
 
 // Where should we install DIRECT?
 #if $[or $[CTPROJS],$[DIRECT]]
-  #set DTOOL $[unixfilename $[DIRECT]]
+  #set DIRECT $[unixfilename $[DIRECT]]
   #define DIRECT_INSTALL $[DIRECT]
   #define DIRECT_INSTALL_OTHER $(DIRECT)
   #if $[eq $[DIRECT],]
@@ -56,4 +56,3 @@
 #endif
 
 #include $[PANDA_SOURCE]/Package.pp
-
diff --git a/panda/Package.pp b/panda/Package.pp
index 1e5c9f3749..52cd2f9344 100644
--- a/panda/Package.pp
+++ b/panda/Package.pp
@@ -12,7 +12,6 @@
 // responsible for explicitly including all of the relevent Config.pp
 // files.
 
-
 // What is the name and version of this source tree?
 #if $[eq $[PACKAGE],]
   #define PACKAGE panda
diff --git a/pandatool/Package.pp b/pandatool/Package.pp
index fd13e054d6..06a4875a1b 100644
--- a/pandatool/Package.pp
+++ b/pandatool/Package.pp
@@ -24,7 +24,7 @@
 // Where should we find the PANDA source directory?
 #if $[or $[CTPROJS],$[PANDA]]
   // If we are presently attached, use the environment variable.
-  #define PANDA_SOURCE $[PANDA]
+  #define PANDA_SOURCE $[unixfilename $[PANDA]]
   #if $[eq $[PANDA],]
     #error You seem to be attached to some trees, but not PANDA!
   #endif
@@ -36,14 +36,15 @@
 
 // Where should we install PANDATOOL?
 #if $[or $[CTPROJS],$[PANDATOOL]]
+  #set PANDATOOL $[unixfilename $[PANDATOOL]]
   #define PANDATOOL_INSTALL $[PANDATOOL]
   #define PANDATOOL_INSTALL_OTHER $(PANDATOOL)
   #if $[eq $[PANDATOOL],]
     #error You seem to be attached to some trees, but not PANDATOOL!
   #endif
 #else
-  #defer PANDATOOL_INSTALL $[INSTALL_DIR]
-  #defer PANDATOOL_INSTALL_OTHER $[INSTALL_DIR]
+  #defer PANDATOOL_INSTALL $[unixfilename $[INSTALL_DIR]]
+  #defer PANDATOOL_INSTALL_OTHER $[unixfilename $[INSTALL_DIR]]
 #endif