daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
pull/24503/head
Ben Noordhuis 2012-08-04 02:18:16 +02:00
parent 5fdeebd94d
commit b21c8e0bfd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/install.py
View File

@ -188,8 +188,8 @@ def files(action):
# with dtrace support now (oracle's "unbreakable" linux) # with dtrace support now (oracle's "unbreakable" linux)
action(['src/node.d'], 'lib/dtrace/') action(['src/node.d'], 'lib/dtrace/')
if variables.get('node_install_waf'): waf_files(action) if 'true' == variables.get('node_install_waf'): waf_files(action)
if variables.get('node_install_npm'): npm_files(action) if 'true' == variables.get('node_install_npm'): npm_files(action)
def run(args): def run(args):
global dst_dir, node_prefix, target_defaults, variables global dst_dir, node_prefix, target_defaults, variables
@ -202,7 +202,7 @@ def run(args):
target_defaults = conf['target_defaults'] target_defaults = conf['target_defaults']
# argv[2] is a custom install prefix for packagers (think DESTDIR) # 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) if len(args) > 2: dst_dir = abspath(args[2] + '/' + dst_dir)
cmd = args[1] if len(args) > 1 else 'install' cmd = args[1] if len(args) > 1 else 'install'