diff --git a/configure.py b/configure.py index f9ca7387d9aeff..e9b610a16d75d0 100755 --- a/configure.py +++ b/configure.py @@ -739,6 +739,14 @@ help='compile shared library for embedding node in another project. ' + '(This mode is not officially supported for regular applications)') +parser.add_argument('--libdir', + action='store', + dest='libdir', + default='lib', + help='a directory to install the shared library into relative to the ' + 'prefix. This is a no-op if --shared is not specified. ' + + '(This mode is not officially supported for regular applications)') + parser.add_argument('--without-v8-platform', action='store_true', dest='without_v8_platform', @@ -1372,6 +1380,7 @@ def configure_node(o): o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) o['variables']['node_shared'] = b(options.shared) + o['variables']['libdir'] = options.libdir node_module_version = getmoduleversion.get_version() if options.dest_os == 'android': diff --git a/tools/install.py b/tools/install.py index a6d1f8b3caa8e2..15061be02620f1 100755 --- a/tools/install.py +++ b/tools/install.py @@ -169,19 +169,14 @@ def files(action): # install libnode.version.so so_name = 'libnode.' + re.sub(r'\.x$', '.so', variables.get('shlib_suffix')) - action([output_prefix + so_name], 'lib/' + so_name) + action([output_prefix + so_name], variables.get('libdir') + '/' + so_name) # create symlink of libnode.so -> libnode.version.so (C++ addons compat) link_path = abspath(install_path, 'lib/libnode.so') try_symlink(so_name, link_path) else: output_lib = 'libnode.' + variables.get('shlib_suffix') - action([output_prefix + output_lib], 'lib/' + output_lib) - if 'true' == variables.get('node_use_dtrace'): - action(['out/Release/node.d'], 'lib/dtrace/node.d') - - # behave similarly for systemtap - action(['src/node.stp'], 'share/systemtap/tapset/') + action([output_prefix + output_lib], variables.get('libdir') + '/' + output_lib) action(['deps/v8/tools/gdbinit'], 'share/doc/node/') action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/')