Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "build: fix `make install DESTDIR=/path`"

This reverts commit f805139.

The reverted commit made DESTDIR behave more like we want it to but it was
pointed out in #3489 that it makes life a lot harder for distro package
maintainers.

Those guys and gals already have a hard enough time as it is, let's not make
their jobs even more hellish.
  • Loading branch information...
commit 8966480c0e332ecea5c39d4e42e36fa400b0a629 1 parent 7de6eba
@bnoordhuis bnoordhuis authored
Showing with 5 additions and 5 deletions.
  1. +5 −5 tools/installer.js
View
10 tools/installer.js
@@ -11,7 +11,7 @@ if (cmd !== 'install' && cmd !== 'uninstall') {
// Use the built-in config reported by the current process
var variables = process.config.variables,
- node_prefix = dest_dir || variables.node_prefix || '/usr/local';
+ node_prefix = variables.node_prefix || '/usr/local';
// Execution queue
var queue = [],
@@ -27,7 +27,7 @@ function copy(src, dst, callback) {
return;
}
- dst = path.join(node_prefix, dst);
+ dst = path.join(dest_dir, node_prefix, dst);
var dir = dst.replace(/\/[^\/]*$/, '/');
// Create directory if hasn't done this yet
@@ -43,7 +43,7 @@ function copy(src, dst, callback) {
// Remove files
function remove(files) {
files.forEach(function(file) {
- file = path.join(node_prefix, file);
+ file = path.join(dest_dir, node_prefix, file);
queue.push('rm -rf ' + file);
});
}
@@ -146,9 +146,9 @@ if (cmd === 'install') {
if (!isSymlink) {
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'));
+ path.join(dest_dir, node_prefix, 'bin/npm'));
queue.push([shebang, '#!' + path.join(node_prefix, 'bin/node'),
- path.join(node_prefix,
+ path.join(dest_dir, node_prefix,
'lib/node_modules/npm/bin/npm-cli.js')]);
}
}

0 comments on commit 8966480

Please sign in to comment.
Something went wrong with that request. Please try again.