Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.449
diff -u -3 -p -r1.449 bootstrap.inc
--- includes/bootstrap.inc	1 Dec 2010 07:52:26 -0000	1.449
+++ includes/bootstrap.inc	3 Dec 2010 17:27:46 -0000
@@ -382,12 +382,13 @@ function conf_path($require_settings = T
     return $conf;
   }
 
+  define('DRUPAL_CONFDIR', DRUPAL_ROOT . '/sites');
-  $confdir = 'sites';
+  $confdir = DRUPAL_CONFDIR;
 
   $sites = array();
-  if (file_exists(DRUPAL_ROOT . '/' . $confdir . '/sites.php')) {
+  if (file_exists(DRUPAL_CONFDIR . '/sites.php')) {
     // This will overwrite $sites with the desired mappings.
-    include(DRUPAL_ROOT . '/' . $confdir . '/sites.php');
+    include(DRUPAL_CONFDIR . '/sites.php');
   }
 
   $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']);
@@ -395,10 +396,10 @@ function conf_path($require_settings = T
   for ($i = count($uri) - 1; $i > 0; $i--) {
     for ($j = count($server); $j > 0; $j--) {
       $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i));
-      if (isset($sites[$dir]) && file_exists(DRUPAL_ROOT . '/' . $confdir . '/' . $sites[$dir])) {
+      if (isset($sites[$dir]) && file_exists(DRUPAL_CONFDIR . '/' . $sites[$dir])) {
         $dir = $sites[$dir];
       }
-      if (file_exists(DRUPAL_ROOT . '/' . $confdir . '/' . $dir . '/settings.php') || (!$require_settings && file_exists(DRUPAL_ROOT . '/' . $confdir . '/' . $dir))) {
+      if (file_exists(DRUPAL_CONFDIR . '/' . $dir . '/settings.php') || (!$require_settings && file_exists(DRUPAL_CONFDIR . '/' . $dir))) {
         $conf = "$confdir/$dir";
         return $conf;
       }
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1269
diff -u -3 -p -r1.1269 common.inc
--- includes/common.inc	1 Dec 2010 00:23:36 -0000	1.1269
+++ includes/common.inc	3 Dec 2010 17:27:47 -0000
@@ -5098,12 +5098,13 @@ function drupal_system_listing($mask, $d
   // themes as organized by a distribution. It is pristine in the same way
   // that /modules is pristine for core; users should avoid changing anything
   // there in favor of sites/all or sites/<domain> directories.
-  if (file_exists("profiles/$profile/$directory")) {
+  if (file_exists(DRUPAL_ROOT . "/profiles/$profile/$directory")) {
-    $searchdir[] = "profiles/$profile/$directory";
+    $searchdir[] = DRUPAL_ROOT . "/profiles/$profile/$directory";
   }
 
   // Always search sites/all/* as well as the global directories
+  define('DRUPAL_CONFDIR', DRUPAL_ROOT . '/sites');
-  $searchdir[] = 'sites/all/' . $directory;
+  $searchdir[] = DRUPAL_CONFDIR . '/all/' . $directory;
 
   if (file_exists("$config/$directory")) {
     $searchdir[] = "$config/$directory";
Index: includes/install.core.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/install.core.inc,v
retrieving revision 1.45
diff -u -3 -p -r1.45 install.core.inc
--- includes/install.core.inc	29 Nov 2010 04:45:10 -0000	1.45
+++ includes/install.core.inc	3 Dec 2010 17:27:47 -0000
@@ -1540,7 +1540,8 @@ function install_check_requirements($ins
     $writable = FALSE;
     $conf_path = './' . conf_path(FALSE, TRUE);
     $settings_file = $conf_path . '/settings.php';
+    define('DRUPAL_CONFDIR', DRUPAL_ROOT . '/sites');
-    $default_settings_file = './sites/default/default.settings.php';
+    $default_settings_file = DRUPAL_CONFDIR . '/default/default.settings.php';
     $file = $conf_path;
     $exists = FALSE;
     // Verify that the directory exists.