Commits

camlspotter committed f7b4d28 Merge

merge with 4.00.0.2.0.1

Comments (0)

Files changed (3)

 #######################################################################
 
 
-OCAMLDIR=$(PREFIX)/lib/ocaml/
+OCAMLDIR=$(shell ocamlc -where)
 include $(OCAMLDIR)/Makefile.config
 
 # Various commands and dir

opam/ocamlspot.4.00.0.2.0.1/url

File contents unchanged.

opam/template/opam

 opam-version: "1"
 maintainer: "jun.furuse@gmail.com"
 build: [
-  ["%{make}%" "all" "opt" "install" "BINDIR=%{bin}%" "EMACSDIR=%{lib}%/ocamlspot"]
+  ["%{make}%" "all" "opt" "install" "BINDIR=%{bin}%" "EMACSDIR=%{lib}%/ocamlspot" "PREFIX=%{prefix}%"]
   ["cp" "ocamlspot.vim" "%{lib}%/ocamlspot"]
 ]
 remove: [
-  ["%{make}%" "uninstall" "BINDIR=%{bin}%"]
+  ["%{make}%" "uninstall" "BINDIR=%{bin}%" "PREFIX=%{prefix}%"]
   ["rm" "-rf" "%{lib}%/ocamlspot"]
 ]
 (* It is known to work with 4.00.1+dev3 too *)