? .drush_make.project.inc.swp
? .drush_make.utilities.inc.swp
Index: drush_make.project.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush_make/Attic/drush_make.project.inc,v
retrieving revision 1.1.2.16
diff -u -r1.1.2.16 drush_make.project.inc
--- drush_make.project.inc	26 Nov 2009 06:55:00 -0000	1.1.2.16
+++ drush_make.project.inc	27 Nov 2009 19:14:25 -0000
@@ -113,16 +113,26 @@
     return implode('/', $path);
   }
 
+  /**
+   * Return the proper path for dependencies to be placed in.
+   *
+   * @return
+   *   The path that dependencies will be placed in.
+   */
+  protected function buildPath() {
+    return $this->base_install_path();
+  }
+
   function recurse($path, $directory) {
-    $makefiles = drush_scan_directory($this->path . '/' . $directory, '/\.make$/');
-    if (!empty($makefiles)) {
-      $build_path = $this->base_install_path;
-      foreach ($makefiles as $file) {
-        $info  = $this->queue->addItem('drush_make_parse_info_file', $file->filename);
-        $valid = $this->queue->addItem('drush_make_validate_info_file', array(), $info);
-        $this->queue->addItem('drush_make_add_projects', array(TRUE, trim($build_path, '/'), $this->tmp_path, $this->base_path), array($valid));
-        $this->queue->addItem('drush_make_add_libraries', array(trim($build_path, '/'), $this->tmp_path, $this->base_path), array($valid));
-      }
+    $makefile = $this->path . '/' . $directory . '/' . $this->name . '.make';
+
+    if (file_exists($makefile)) {
+      drush_log(dt("Found makefile : %makefile", array("%makefile" => basename($makefile))), 'ok');
+      $build_path = $this->buildPath();
+      $info  = $this->queue->addItem('drush_make_parse_info_file', $makefile);
+      $valid = $this->queue->addItem('drush_make_validate_info_file', array(), $info);
+      $this->queue->addItem('drush_make_add_projects', array(TRUE, trim($build_path, '/'), $this->tmp_path, $this->base_path), array($valid));
+      $this->queue->addItem('drush_make_add_libraries', array(trim($build_path, '/'), $this->tmp_path, $this->base_path), array($valid));
     }
   }
 }
@@ -186,17 +196,8 @@
     $this->install_path = 'profiles';
   }
 
-  function recurse($path, $directory) {
-    $makefiles = drush_scan_directory($this->path . '/' . $directory, '/\.make$/');
-    if (!empty($makefiles)) {
-      $build_path = $this->generatePath(FALSE) . '/' . $directory;
-      foreach ($makefiles as $file) {
-        $info  = $this->queue->addItem('drush_make_parse_info_file', $file->filename);
-        $valid = $this->queue->addItem('drush_make_validate_info_file', array(), $info);
-        $this->queue->addItem('drush_make_add_projects', array(TRUE, trim($build_path, '/'), $this->tmp_path, $this->base_path), array($valid));
-        $this->queue->addItem('drush_make_add_libraries', array(trim($build_path, '/'), $this->tmp_path, $this->base_path), array($valid));
-      }
-    }
+  protected function buildPath() {
+    return $this->generatePath(FALSE) . '/' . $directory;
   }
 }