23 lines
765 B
Text
23 lines
765 B
Text
Index: configure.make
|
|
--- configure.make.orig
|
|
+++ configure.make
|
|
@@ -18,16 +18,9 @@ OCAML_MANDIR = $(MANDIR)
|
|
# OCAMLBUILD_* variables.
|
|
|
|
OCAMLBUILD_PREFIX ?= $(PREFIX)
|
|
-OCAMLBUILD_BINDIR ?= \
|
|
- $(or $(shell opam config var bin 2>/dev/null),\
|
|
- $(PREFIX)/bin)
|
|
-OCAMLBUILD_LIBDIR ?= \
|
|
- $(or $(shell opam config var lib 2>/dev/null),\
|
|
- $(shell ocamlfind printconf destdir 2>/dev/null),\
|
|
- $(OCAML_LIBDIR))
|
|
-OCAMLBUILD_MANDIR ?= \
|
|
- $(or $(shell opam config var man 2>/dev/null),\
|
|
- $(OCAML_MANDIR))
|
|
+OCAMLBUILD_BINDIR ?= $(BINDIR)
|
|
+OCAMLBUILD_LIBDIR ?= $(LIBDIR)
|
|
+OCAMLBUILD_MANDIR ?= $(MANDIR)
|
|
|
|
# It is important to distinguish OCAML_LIBDIR, which points to the
|
|
# directory of the ocaml compiler distribution, and OCAMLBUILD_LIBDIR,
|