This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch debian/experimental
in repository ocaml.
commit 10cedb25012bab269620dba81cfb269880b29260
Author: Ximin Luo <infini...@debian.org>
Date: Fri Jul 21 17:42:50 2017 +0200
More restructuring of ocamlvars.mk to pull in dependency variables
---
debian/ocamlvars.mk | 6 +++++-
debian/rules | 8 +++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/debian/ocamlvars.mk b/debian/ocamlvars.mk
index 1ec6437..3f43659 100644
--- 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 4224b32..a6b1c99 100755
--- 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)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
