Merge pull request #4347 from tschaub/find-jsdoc

Use require.resolve() to find jsdoc.
2015-10-31 13:26:58 -06:00
parent 0b7cd12eaa dc0e37b782
commit c0da5ff8ef
1 changed files with 6 additions and 4 deletions
@@ -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(