From: Ximin Luo <infinity0@debian.org>
Date: Fri, 21 Jul 2017 15:37:58 +0000 (+0200)
Subject: Removing $(_ocaml_share_path)/ocamlvars.mk was too hasty, it defines OCAML_DLL_DIR
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~50
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c6136f5c6f88eda37fd8645a7f7e4c2c8e8f32f6;p=ocaml.git

Removing $(_ocaml_share_path)/ocamlvars.mk was too hasty, it defines OCAML_DLL_DIR
---

diff --git a/debian/ocamlinit.mk b/debian/ocamlinit.mk
index 4ce7b66e..10b216ae 100644
--- a/debian/ocamlinit.mk
+++ b/debian/ocamlinit.mk
@@ -19,10 +19,13 @@
 # 02110-1301 USA.
 #
 
+_ocaml_share_path ?= /usr/share/ocaml
+
 ifndef _ocaml_share_ocamlinit
 _ocaml_share_ocamlinit = 1
 
 include $(CURDIR)/debian/ocamlvars.mk
+include $(_ocaml_share_path)/ocamlvars.mk
 -include $(CURDIR)/config/Makefile
 
 # list of .in files contained (non-recursively) in debian/ that requires