node-gyp@0.13.1

node_modules/node-gyp/README.md

@@ -45,6 +45,21 @@ You will also need to install:
     * Windows 7/8:
       * Microsoft Visual Studio C++ 2012 for Windows Desktop ([Express][msvc2012] version works well)
 
+If you have multiple Python versions installed, you can identify which Python
+version `node-gyp` uses by setting the '--python' variable:
+
+``` bash
+$ node-gyp --python /path/to/python2.7
+```
+
+If `node-gyp` is called by way of `npm` *and* you have multiple versions of
+Python installed, then you can set `npm`'s 'python' config key to the appropriate
+value:
+
+``` bash
+$ npm config set python /path/to/executable/python2.7
+```
+
 Note that OS X is just a flavour of Unix and so needs `python`, `make`, and C/C++.
 An easy way to obtain these is to install XCode from Apple,
 and then use it to install the command line tools (under Preferences -> Downloads).

node_modules/node-gyp/lib/configure.js

@@ -327,6 +327,9 @@ function configure (gyp, argv, callback) {
     // execute `gyp` from the current target nodedir
     argv.unshift(gyp_script)
 
+    // make sure python uses files that came with this particular node package
+    process.env.PYTHONPATH = path.resolve(__dirname, '..', 'gyp', 'pylib')
+
     var cp = gyp.spawn(python, argv)
     cp.on('exit', onCpExit)
   }

node_modules/node-gyp/lib/node-gyp.js

@@ -203,9 +203,6 @@ proto.usage = function usage () {
         return '    - ' + c + ' - ' + require('./' + c).usage
       }).join('\n')
     , ''
-    , '  for specific command usage and options try:'
-    , '    $ node-gyp <command> --help'
-    , ''
     , 'node-gyp@' + this.version + '  ' + path.resolve(__dirname, '..')
     , 'node@' + process.versions.node
   ].join('\n')