diff --git a/direct/Package.pp b/direct/Package.pp
index 5d1c02e0b8..51d3658679 100644
--- a/direct/Package.pp
+++ b/direct/Package.pp
@@ -37,7 +37,7 @@
 // Where should we install DIRECT?
 #if $[DIRECT_INSTALL]
   #define DIRECT_INSTALL $[unixfilename $[DIRECT_INSTALL]]
-#elif $[or $[CTPROJS],$[DIRECT]]
+#elif $[CTPROJS]
   #set DIRECT $[unixfilename $[DIRECT]]
   #define DIRECT_INSTALL $[DIRECT]/built
   #if $[eq $[DIRECT],]
diff --git a/dtool/Package.pp b/dtool/Package.pp
index 538a3607c0..f0f769c997 100644
--- a/dtool/Package.pp
+++ b/dtool/Package.pp
@@ -33,7 +33,7 @@
 // Where should we install DTOOL, specifically?
 #if $[DTOOL_INSTALL]
   #define DTOOL_INSTALL $[unixfilename $[DTOOL_INSTALL]]
-#elif $[or $[CTPROJS],$[DTOOL]]
+#elif $[CTPROJS]
   // If we are presently attached, use the environment variable.
   // We define two variables: one for ourselves, which burns in the
   // current value of the DTOOL environment variable (so that any
diff --git a/panda/Package.pp b/panda/Package.pp
index 0bc62982de..05a50b92e2 100644
--- a/panda/Package.pp
+++ b/panda/Package.pp
@@ -37,7 +37,7 @@
 // Where should we install PANDA?
 #if $[PANDA_INSTALL]
   #define PANDA_INSTALL $[unixfilename $[PANDA_INSTALL]]
-#elif $[or $[CTPROJS],$[PANDA]]
+#elif $[CTPROJS]
   #set PANDA $[unixfilename $[PANDA]]
   #define PANDA_INSTALL $[PANDA]/built
   #if $[eq $[PANDA],]
diff --git a/pandaapp/Package.pp b/pandaapp/Package.pp
index a14a386435..5aee397978 100644
--- a/pandaapp/Package.pp
+++ b/pandaapp/Package.pp
@@ -35,15 +35,15 @@
 #endif
 
 // Where should we install PANDAAPP?
-#if $[or $[CTPROJS],$[PANDAAPP]]
+#if $[PANDAAPP_INSTALL]
+  #define PANDAAPP_INSTALL $[unixfilename $[PANDAAPP_INSTALL]]
+#elif $[CTPROJS]
   #define PANDAAPP_INSTALL $[PANDAAPP]/built
-  #define PANDAAPP_INSTALL_OTHER $(PANDAAPP)
   #if $[eq $[PANDAAPP],]
     #error You seem to be attached to some trees, but not PANDAAPP!
   #endif
 #else
   #defer PANDAAPP_INSTALL $[unixfilename $[INSTALL_DIR]]
-  #defer PANDAAPP_INSTALL_OTHER $[unixfilename $[INSTALL_DIR]]
 #endif
 
 // Also get the PANDATOOL Package file and everything that includes.
diff --git a/pandatool/Package.pp b/pandatool/Package.pp
index c8a07f0ab2..28a52d356f 100644
--- a/pandatool/Package.pp
+++ b/pandatool/Package.pp
@@ -35,7 +35,9 @@
 #endif
 
 // Where should we install PANDATOOL?
-#if $[or $[CTPROJS],$[PANDATOOL]]
+#if $[PANDATOOL_INSTALL]
+  #define PANDATOOL_INSTALL $[unixfilename $[PANDATOOL_INSTALL]]
+#elif $[CTPROJS]
   #set PANDATOOL $[unixfilename $[PANDATOOL]]
   #define PANDATOOL_INSTALL $[PANDATOOL]/built
   #if $[eq $[PANDATOOL],]