More restructuring of ocamlvars.mk to pull in dependency variables

diff --git a/debian/ocamlvars.mk b/debian/ocamlvars.mk
index 1ec64373de5307600a066c95cf44d5272538a95a..3f4365926a240ce651a13fae4e23cb8797635907 100644 (file)
--- a/debian/ocamlvars.mk
+++ b/debian/ocamlvars.mk
@@ -1,4 +1,8 @@
-# Can't use /usr/share/ocaml/ocamlvars.mk because it tries to run ocamlc
+include /usr/share/dpkg/architecture.mk
+
+OCAMLMAJOR := 4.05
+OCAMLMINOR := 0
+
 OCAML_ABI := $(OCAMLMAJOR).$(OCAMLMINOR)
 OCAML_STDLIB_DIR := /usr/lib/ocaml
 OCAML_NATIVE_ARCHS := $(shell cat debian/native-archs)

diff --git a/debian/rules b/debian/rules
index 4224b32447d8a567d78e556c3cbce6fe98750f92..a6b1c99d002d5942c5417aa9b310b796de77a485 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
 
 include /usr/share/dpkg/pkg-info.mk
-include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/buildflags.mk
 
 PACKAGE := ocaml
 ALL_PACKAGES := $(shell dh_listpackages)
-OCAMLMAJOR := 4.05
-OCAMLMINOR := 0
+
+# Can't use /usr/share/ocaml/ocamlvars.mk because it tries to run ocamlc
+include $(CURDIR)/debian/ocamlvars.mk
 
 # Use ccache if pkg.ocaml.ccache build-profile is active.
 ifneq (,$(filter pkg.ocaml.ccache,$(DEB_BUILD_PROFILES)))
@@ -20,8 +20,6 @@ endif
 # Build cache (for Debian debugging)
 BUILDCACHE := $(wildcard ../ocaml.cache)
 
-include $(CURDIR)/debian/ocamlvars.mk
-
 MD5SUMSDIR = /var/lib/ocaml/md5sums
 INSTDIR = $(CURDIR)/debian/tmp/usr
 DISTDIR = $(PACKAGE)-$(OCAML_ABI)