Skip to content
Snippets Groups Projects
Commit b40f5147 authored by Fredrik Noring's avatar Fredrik Noring
Browse files

Relative (interactive) paths now works.

Rev: bin/install.pike:1.23
parent 6b92a522
No related branches found
No related tags found
No related merge requests found
...@@ -368,10 +368,16 @@ int main(int argc, string *argv) ...@@ -368,10 +368,16 @@ int main(int argc, string *argv)
interactive=Stdio.Readline(); interactive=Stdio.Readline();
if(!vars->prefix) if(!vars->prefix)
prefix=interactive->edit(prefix,"Install prefix: "); prefix=interactive->edit(prefix,"Install prefix: ");
if(!sizeof(prefix) || prefix[0] != '/')
prefix = combine_path(getcwd(), "../", prefix);
if(!vars->pike_name) if(!vars->pike_name)
vars->pike_name=interactive->edit( vars->pike_name=interactive->edit(
combine_path(vars->exec_prefix || combine_path(prefix, "bin"),"pike"), "Pike binary name: "); combine_path(vars->exec_prefix || combine_path(prefix, "bin"),
"pike"), "Pike binary name: ");
if(!sizeof(vars->pike_name) || vars->pike_name[0] != '/')
vars->pike_name = combine_path(getcwd(), "../", vars->pike_name);
destruct(interactive); destruct(interactive);
install_type="--new-style"; install_type="--new-style";
// trace(2); // trace(2);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment