Index: includes/command.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/command.inc,v
retrieving revision 1.30
diff -u -u -r1.30 command.inc
--- includes/command.inc	7 May 2009 21:56:20 -0000	1.30
+++ includes/command.inc	11 May 2009 17:54:57 -0000
@@ -351,6 +351,7 @@
  *
  * - The ".drush" folder in the users HOME folder.
  * - The "/path/to/drush/includes" folder.
+ * - The "/usr/share/drush" folder.
  * - Folders listed in the 'include' option (see example.drushrc.php).
  * - Active modules in the current Drupal installation (if any).
  *
@@ -369,7 +370,7 @@
 function _drush_find_commandfiles($phase) {
   $cache =& drush_get_context('DRUSH_COMMAND_FILES', array());
 
-  $searchpath = array();
+  $searchpath = array("/usr/share/drush/commands");
   switch ($phase) {
     case DRUSH_BOOTSTRAP_DRUSH :
       // Core commands shipping with drush
Index: includes/context.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/context.inc,v
retrieving revision 1.6
diff -u -u -r1.6 context.inc
--- includes/context.inc	19 Apr 2009 04:05:52 -0000	1.6
+++ includes/context.inc	11 May 2009 17:54:57 -0000
@@ -49,7 +49,7 @@
  *      site     : Loaded from the drushrc.php file in the Drupal sites directory.
  *      drupal    : Loaded from the drushrc.php file in the Drupal root directory.
  *      user     : Loaded from the drushrc.php file in the user's home directory.
- *      drush    : Loaded from the drushrc.php file in the same directory as drush.php.
+ *      drush    : Loaded from the drushrc.php file in the system-wide directory
  *
  *    Specified by the script, but has the lowest priority :
  *      default  : The script might provide some sensible defaults during init.
@@ -86,9 +86,8 @@
   // in the user home directory
   $configs['user'] = $_SERVER['HOME'] . '/.drushrc.php';
 
-  // in the drush installation folder
-  // TODO: This really should be a proper, system-wide location.
-  $configs['drush'] = dirname(__FILE__) . '/../drushrc.php';
+  // in the drush system-wide configuration directory
+  $configs['drush'] = '/etc/drush/drushrc.php';
 
   return empty($configs[$context]) ? '' : $configs[$context];
 }