From: Stefano Zacchiroli <zack@debian.org>
Date: Fri, 13 Oct 2006 08:27:10 +0000 (+0000)
Subject: added support for substituting @OCamlStdlibDir@
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~599
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3dfb41992fc63d3a550fb1085febf0c61b31791e;p=ocaml.git

added support for substituting @OCamlStdlibDir@
---

diff --git a/debian/cdbs/ocaml-vars.mk b/debian/cdbs/ocaml-vars.mk
index cdd5e589..f46f87af 100644
--- a/debian/cdbs/ocaml-vars.mk
+++ b/debian/cdbs/ocaml-vars.mk
@@ -16,7 +16,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 51
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id: ocaml-vars.mk 3235 2006-10-12 06:52:48Z zack $
+# $Id: ocaml-vars.mk 3237 2006-10-13 08:27:10Z zack $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -26,11 +26,13 @@ ifndef _cdbs_class_ocaml_vars
 _cdbs_class_ocaml = 1
 
 # current OCaml ABI version (ATM 3.09.2).
-# Used internally by ocaml.mk, may be useful to debian/rules writers as well
+# Used internally by ocaml.mk (substituted for @OCamlABI@ in $(OCAML_IN_FILES)
+# below), may be useful to debian/rules writers as well
 OCAML_ABI := $(shell /usr/bin/ocamlc -version)
 
 # OCaml standard library location.
-# For debian/rules writers.
+# Used internally by ocaml.mk (substituted for @OCamlStdlibDir@ in
+# $(OCAML_IN_FILES) below), may be useful to debian/rules writers as well
 OCAML_STDLIB_DIR := $(shell /usr/bin/ocamlc -where)
 
 # list of .in files contained (non-recursively) in debian/ that requires
diff --git a/debian/cdbs/ocaml.mk b/debian/cdbs/ocaml.mk
index 1d37792d..221f7659 100644
--- a/debian/cdbs/ocaml.mk
+++ b/debian/cdbs/ocaml.mk
@@ -16,7 +16,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 51
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id: ocaml.mk 3235 2006-10-12 06:52:48Z zack $
+# $Id: ocaml.mk 3237 2006-10-13 08:27:10Z zack $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -46,7 +46,10 @@ pre-build:: ocamlinit
 ocamlinit: ocamlinit-stamp
 ocamlinit-stamp:
 	for f in $(OCAML_IN_FILES) ; do \
-		sed -e 's/@OCamlABI@/$(OCAML_ABI)/g' $$f.in > $$f ; \
+		sed \
+			-e 's/@OCamlABI@/$(OCAML_ABI)/g' \
+			-e 's/@OCamlStdlibDir@/$(OCAML_STDLIB_DIR)/g' \
+			$$f.in > $$f ; \
 	done
 	touch $@
 clean::