diff --git a/doc/api/modules.markdown b/doc/api/modules.markdown index d90cf57873..4720aa5ece 100644 --- a/doc/api/modules.markdown +++ b/doc/api/modules.markdown @@ -383,7 +383,7 @@ Additionally, node will search in the following locations: * 3: `$PREFIX/lib/node` Where `$HOME` is the user's home directory, and `$PREFIX` is node's -configured `installPrefix`. +configured `node_prefix`. These are mostly for historic reasons. You are highly encouraged to place your dependencies locally in `node_modules` folders. They will be diff --git a/doc/api/process.markdown b/doc/api/process.markdown index 7c1b5e3d41..ecd132070c 100644 --- a/doc/api/process.markdown +++ b/doc/api/process.markdown @@ -300,13 +300,6 @@ An example of the possible output looks like: target_arch: 'x64', v8_use_snapshot: 'true' } } -## process.installPrefix - -A compiled-in property that exposes `NODE_PREFIX`. - - console.log('Prefix: ' + process.installPrefix); - - ## process.kill(pid, [signal]) Send a signal to a process. `pid` is the process id and `signal` is the diff --git a/src/node.cc b/src/node.cc index 635e5e8999..991f63b31e 100644 --- a/src/node.cc +++ b/src/node.cc @@ -2134,11 +2134,6 @@ Handle SetupProcessObject(int argc, char *argv[]) { // process.version process->Set(String::NewSymbol("version"), String::New(NODE_VERSION)); -#ifdef NODE_PREFIX - // process.installPrefix - process->Set(String::NewSymbol("installPrefix"), String::New(NODE_PREFIX)); -#endif - // process.moduleLoadList module_load_list = Persistent::New(Array::New()); process->Set(String::NewSymbol("moduleLoadList"), module_load_list); @@ -2378,7 +2373,6 @@ static void PrintHelp() { " -i, --interactive always enter the REPL even if stdin\n" " does not appear to be a terminal\n" " --v8-options print v8 command line options\n" - " --vars print various compiled-in variables\n" " --max-stack-size=val set max v8 stack size (bytes)\n" "\n" "Environment variables:\n" @@ -2408,14 +2402,6 @@ static void ParseArgs(int argc, char **argv) { } else if (strcmp(arg, "--version") == 0 || strcmp(arg, "-v") == 0) { printf("%s\n", NODE_VERSION); exit(0); - } else if (strcmp(arg, "--vars") == 0) { -#ifdef NODE_PREFIX - printf("NODE_PREFIX: %s\n", NODE_PREFIX); -#endif -#ifdef NODE_CFLAGS - printf("NODE_CFLAGS: %s\n", NODE_CFLAGS); -#endif - exit(0); } else if (strstr(arg, "--max-stack-size=") == arg) { const char *p = 0; p = 1 + strchr(arg, '='); diff --git a/src/node_config.h.in b/src/node_config.h.in deleted file mode 100644 index 18d1d7504a..0000000000 --- a/src/node_config.h.in +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -#ifndef NODE_CONFIG_H -#define NODE_CONFIG_H - -#define NODE_CFLAGS "@CCFLAGS@ @CPPFLAGS@ -I@PREFIX@/include/node" -#define NODE_PREFIX "@PREFIX@" - -#endif /* NODE_CONFIG_H */ diff --git a/src/node_version.h b/src/node_version.h index f0aab778f8..9e5014ce9e 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -19,10 +19,6 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#if 0 /* commenting out to build via gyp faster */ -#include "node_config.h" -#endif - #ifndef NODE_VERSION_H #define NODE_VERSION_H