From a9f2c4aa307c3dc838d9ecb0fb4e241a42f4f2a1 Mon Sep 17 00:00:00 2001 From: Fedor Indutny Date: Sat, 17 Dec 2011 14:09:14 +0600 Subject: --without-npm option Fixes #2353. --- configure | 6 ++++++ tools/installer.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 48b5b9b18e..1104c75d22 100755 --- a/configure +++ b/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() diff --git a/tools/installer.js b/tools/installer.js index 1adfc8e809..ef2f883a0f 100644 --- a/tools/installer.js +++ b/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')); -- cgit v1.2.1