Browse Source

de-windowsify pathnames

David Rose 23 years ago
parent
commit
b6e2a41d60
3 changed files with 5 additions and 6 deletions
  1. 1 2
      direct/Package.pp
  2. 0 1
      panda/Package.pp
  3. 4 3
      pandatool/Package.pp

+ 1 - 2
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
-

+ 0 - 1
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

+ 4 - 3
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