diff options
| author | pboutill | 2011-12-17 21:22:37 +0000 |
|---|---|---|
| committer | pboutill | 2011-12-17 21:22:37 +0000 |
| commit | 557bab888d8148f547fceda473610d3dd85efa84 (patch) | |
| tree | 3cc08d425728622cdd2b3761c766fb7c62e21bc4 /ide | |
| parent | 2ae65af3007c5ed79e932135f27704cae00dd449 (diff) | |
Coq_makefile: if no -install is provided, install location is set by a Makefile variable or a special target.
1/ defining the USERINSTALL variable make a "user" installation instead of a "global" one.
2/ make userinstall is an alias for make USERINSTALL=true install
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14805 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'ide')
| -rw-r--r-- | ide/project_file.ml4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ide/project_file.ml4 b/ide/project_file.ml4 index 806e40d767..6bee0fec11 100644 --- a/ide/project_file.ml4 +++ b/ide/project_file.ml4 @@ -16,6 +16,7 @@ type install = | NoInstall | TraditionalInstall | UserInstall + | UnspecInstall exception Parsing_error let rec parse_string = parser @@ -58,7 +59,7 @@ let rec process_cmd_line orig_dir ((project_file,makefile,install,opt) as opts) Minilib.safe_prerr_endline "Option -no-install is deprecated. Use \"-install none\" instead"; process_cmd_line orig_dir (project_file,makefile,NoInstall,opt) l r | "-install" :: d :: r -> - if install <> TraditionalInstall then Minilib.safe_prerr_endline "Warning: -install sets more than once."; + if install <> UnspecInstall then Minilib.safe_prerr_endline "Warning: -install sets more than once."; let install = match d with | "user" -> UserInstall |