Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
Revert "build: fix make install DESTDIR=/path"
Browse files Browse the repository at this point in the history
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
bnoordhuis committed Jun 19, 2012
1 parent 7de6eba commit 8966480
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tools/installer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [],
Expand All @@ -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
Expand All @@ -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);
});
}
Expand Down Expand Up @@ -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')]);
}
}
Expand Down

0 comments on commit 8966480

Please sign in to comment.