Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Modified Makefile to use PREFIX instead of BIN, modified opam.ml to l…

…oad a man page instead of displaying SubCommand help
  • Loading branch information...
commit a60c2651259e94bf8d3314eedbd92976e90fe928 1 parent ed20d37
Vincent Bernardoff authored
Showing with 5 additions and 5 deletions.
  1. +2 −2 Makefile
  2. +3 −3 src/opam.ml
View
4 Makefile
@@ -1,4 +1,4 @@
-BIN = /usr/local/bin
+PREFIX = /usr/local
LOCAL_OCPBUILD=./ocp-build/ocp-build
OCPBUILD ?= $(LOCAL_OCPBUILD)
OCAMLC=ocamlc
@@ -54,7 +54,7 @@ tests-git:
$(MAKE) -C tests git
%-install:
- cp _obuild/$*/$*.asm $(BIN)/$*
+ cp _obuild/$*/$*.asm $(PREFIX)/bin/$*
PRODUCT_VERSION=$(shell grep "let version" src/globals.ml | cut -f 2 -d \")
META: META.in
View
6 src/opam.ml
@@ -379,16 +379,16 @@ let commands = [
let () =
Sys.catch_break true;
List.iter SubCommand.register commands;
- try ArgExt.parse global_args
+ try ArgExt.parse ~man:"opam" global_args
with e ->
Globals.msg " '%s' failed\n" (String.concat " " (Array.to_list Sys.argv));
match e with
| Bad (cmd, msg) ->
- ArgExt.pp_print_help (ArgExt.SubCommand cmd) Format.err_formatter global_args ();
+ ArgExt.pp_print_help ~man:"opam" (ArgExt.SubCommand cmd) Format.err_formatter global_args ();
Globals.msg "%s\n" msg;
exit 1;
| Failure ("no subcommand defined" as s) ->
- ArgExt.pp_print_help ArgExt.NoSubCommand Format.err_formatter global_args ();
+ ArgExt.pp_print_help ~man:"opam" ArgExt.NoSubCommand Format.err_formatter global_args ();
Globals.msg "%s\n" s;
exit 2
| Globals.Exit i -> exit i
Please sign in to comment.
Something went wrong with that request. Please try again.