diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-08-04 04:18:16 +0400 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-08-04 04:18:18 +0400 |
| commit | b21c8e0bfd7539859c79fab63da88a53abe4f25a (patch) | |
| tree | b61796f77b1a9cbfdc2110cc83a1a432c1994416 /tools | |
| parent | 5fdeebd94d58bf715d991d5bc63be6fff507f27d (diff) | |
installer: honor --without-npm, default install path
* honor the --without-waf and --without-npm configure switches
* a small logic bug made the installer script install to $PWD instead of
/usr/local if --prefix= was not passed to configure
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/install.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/install.py b/tools/install.py index 66e51d0ae3b..85e8bc01d06 100755 --- a/tools/install.py +++ b/tools/install.py @@ -188,8 +188,8 @@ def files(action): # with dtrace support now (oracle's "unbreakable" linux) action(['src/node.d'], 'lib/dtrace/') - if variables.get('node_install_waf'): waf_files(action) - if variables.get('node_install_npm'): npm_files(action) + if 'true' == variables.get('node_install_waf'): waf_files(action) + if 'true' == variables.get('node_install_npm'): npm_files(action) def run(args): global dst_dir, node_prefix, target_defaults, variables @@ -202,7 +202,7 @@ def run(args): target_defaults = conf['target_defaults'] # argv[2] is a custom install prefix for packagers (think DESTDIR) - dst_dir = node_prefix = variables.get('node_prefix', '/usr/local') + dst_dir = node_prefix = variables.get('node_prefix') or '/usr/local' if len(args) > 2: dst_dir = abspath(args[2] + '/' + dst_dir) cmd = args[1] if len(args) > 1 else 'install' |