From dc0e37b7823f200c674fb8d5934fd23eba9d2340 Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Fri, 30 Oct 2015 06:21:21 -0600
Subject: [PATCH] Use require.resolve() to find jsdoc

---
 tasks/generate-info.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tasks/generate-info.js b/tasks/generate-info.js
index 1ba741ed70..1523c0a6a4 100644
--- a/tasks/generate-info.js
+++ b/tasks/generate-info.js
@@ -14,11 +14,13 @@ var externsPaths = [
   path.join(externsDir, 'geojson.js')
 ];
 var infoPath = path.join(__dirname, '..', 'build', 'info.json');
-var jsdoc = path.join(__dirname, '..', 'node_modules', '.bin', 'jsdoc');
+
+var jsdocResolved = require.resolve('jsdoc/jsdoc.js');
+var jsdoc = path.resolve(path.dirname(jsdocResolved), '../.bin/jsdoc');
 
 // on Windows, use jsdoc.cmd
 if (isWindows) {
- jsdoc += '.cmd';
+  jsdoc += '.cmd';
 }
 
 var jsdocConfig = path.join(
@@ -99,7 +101,7 @@ function getNewer(date, newer, callback) {
     callback(new Error('Trouble walking ' + sourceDir));
   });
   walker.on('end', function() {
-  
+
     /**
      * Windows has restrictions on length of command line, so passing all the
      * changed paths to a task will fail if this limit is exceeded.
@@ -109,7 +111,7 @@ function getNewer(date, newer, callback) {
     if (isWindows) {
         paths = [sourceDir].concat(externsPaths);
     }
-  
+
     callback(null, newer ? paths : []);
   });
 }