Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 0bb099f

Browse filesBrowse files
committed
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: #75 PR-URL: #2307 Reviewed-By: Johan Bergström <bugs@bergstroem.nu> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
1 parent a020d9a commit 0bb099f
Copy full SHA for 0bb099f

File tree

Expand file treeCollapse file tree

1 file changed

+4
-1
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+4
-1
lines changed
Open diff view settings
Collapse file

‎configure‎

Copy file name to clipboardExpand all lines: configure
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,9 @@ parser.add_option('--enable-static',
335335

336336
(options, args) = parser.parse_args()
337337

338+
# Expand ~ in the install prefix now, it gets written to multiple files.
339+
options.prefix = os.path.expanduser(options.prefix or '')
340+
338341
# set up auto-download list
339342
auto_downloads = nodedownload.parse(options.download_list)
340343

@@ -611,7 +614,7 @@ def configure_mips(o):
611614
def configure_node(o):
612615
if options.dest_os == 'android':
613616
o['variables']['OS'] = 'android'
614-
o['variables']['node_prefix'] = os.path.expanduser(options.prefix or '')
617+
o['variables']['node_prefix'] = options.prefix
615618
o['variables']['node_install_npm'] = b(not options.without_npm)
616619
o['default_configuration'] = 'Debug' if options.debug else 'Release'
617620

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.