[Pkg-ocaml-maint-commits] r3237 - in /trunk/packages/ocaml/trunk/debian/cdbs: ocaml-vars.mk ocaml.mk

[zack at users.alioth.debian.org]

Author: zack
Date: Fri Oct 13 08:27:10 2006
New Revision: 3237

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3237
Log:
added support for substituting @OCamlStdlibDir@

Modified:
    trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk
    trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk

Modified: trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk?rev=3237&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk Fri Oct 13 08:27:10 2006
@@ -26,11 +26,13 @@
 _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

Modified: trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk?rev=3237&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk Fri Oct 13 08:27:10 2006
@@ -46,7 +46,10 @@
 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::