Browse Source

--without-npm option

Fixes #2353.
v0.7.4-release
Fedor Indutny 13 years ago
committed by Ryan Dahl
parent
commit
a9f2c4aa30
  1. 6
      configure
  2. 2
      tools/installer.js

6
configure

@ -23,6 +23,11 @@ parser.add_option("--prefix",
dest="prefix",
help="Select the install prefix (defaults to /usr/local)")
parser.add_option("--without-npm",
action="store_true",
dest="without_npm",
help="Don\'t install the bundled npm package manager")
parser.add_option("--without-ssl",
action="store_true",
dest="without_ssl",
@ -162,6 +167,7 @@ def configure_node(o):
o['variables']['node_debug'] = b(options.debug)
o['variables']['node_prefix'] = options.prefix if options.prefix else ''
o['variables']['node_use_dtrace'] = b(options.with_dtrace)
o['variables']['node_install_npm'] = b(not options.without_npm)
o['variables']['host_arch'] = host_arch()
o['variables']['target_arch'] = target_arch()

2
tools/installer.js

@ -95,7 +95,7 @@ if (cmd === 'install') {
copy('out/Release/node', 'bin/node');
// Install npm (eventually)
if (variables.node_install_npm) {
if (variables.node_install_npm == 'true') {
copy('deps/npm', 'lib/node_modules/npm');
queue.push('ln -sF ../lib/node_modules/npm/bin/npm-cli.js ' +
path.join(node_prefix, 'bin/npm'));

Loading…
Cancel
Save