summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2015-08-05 14:44:21 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2015-08-11 13:57:32 +0200
commitae05807f0472fbe73b96660a93ae4b4924eb67ce (patch)
tree22049ccd071ecbbd2f57dfbbb64759085cfc0cfe /configure
parent226b8e0cf8374a0074142145858fa0aa94bca3ce (diff)
downloadnode-new-ae05807f0472fbe73b96660a93ae4b4924eb67ce.tar.gz
build: expand ~ in install prefix early
The install prefix gets written to config.gypi and config.mk. Tildes were expanded in the first file but not in the second one, causing the `make install` target to install files to a directory named `~` in the current working directory. Fixes: https://github.com/nodejs/node/issues/75 PR-URL: https://github.com/nodejs/io.js/pull/2307 Reviewed-By: Johan Bergström <bugs@bergstroem.nu> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure b/configure
index ab2383c814..f01aea6f92 100755
--- a/configure
+++ b/configure
@@ -335,6 +335,9 @@ parser.add_option('--enable-static',
(options, args) = parser.parse_args()
+# Expand ~ in the install prefix now, it gets written to multiple files.
+options.prefix = os.path.expanduser(options.prefix or '')
+
# set up auto-download list
auto_downloads = nodedownload.parse(options.download_list)
@@ -611,7 +614,7 @@ def configure_mips(o):
def configure_node(o):
if options.dest_os == 'android':
o['variables']['OS'] = 'android'
- o['variables']['node_prefix'] = os.path.expanduser(options.prefix or '')
+ o['variables']['node_prefix'] = options.prefix
o['variables']['node_install_npm'] = b(not options.without_npm)
o['default_configuration'] = 'Debug' if options.debug else 'Release'