--- ./tools/install.py.orig Thu Jul 21 22:44:49 2016 +++ ./tools/install.py Sun Jul 24 00:36:51 2016 @@ -9,7 +9,7 @@ from getmoduleversion import get_version # set at init time -node_prefix = '/usr/local' # PREFIX variable from Makefile +node_prefix = '@CLIENT_BASEDIR@' # PREFIX variable from Makefile install_path = None # base target directory (DESTDIR + PREFIX from Makefile) target_defaults = None variables = None @@ -76,7 +76,7 @@ def uninstall(paths, dst): map(lambda path: try_remove(path, dst), paths) def npm_files(action): - target_path = 'lib/node_modules/npm/' + target_path = 'share/node/npm/' # don't install npm if the target path is a symlink, it probably means # that a dev version of npm is installed there @@ -94,7 +94,7 @@ if action == uninstall: action([link_path], 'bin/npm') elif action == install: - try_symlink('../lib/node_modules/npm/bin/npm-cli.js', link_path) + try_symlink('../share/node/npm/bin/npm-cli.js', link_path) else: assert(0) # unhandled action type