[Pkg-ocaml-maint-commits] [ocaml] 01/03: Run ocamlinit-stamp after config-stamp; this allows us to directly use config/Makefile

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian/experimental
in repository ocaml.

commit e1be6bcc7fdc7f2aca39f081bb31373d306bac4c
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Jul 21 15:06:25 2017 +0200

    Run ocamlinit-stamp after config-stamp; this allows us to directly use config/Makefile
---
 debian/ocamlinit.mk |  4 +++-
 debian/rules        | 15 +++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/ocamlinit.mk b/debian/ocamlinit.mk
index 8a4edf4..d914b15 100644
--- a/debian/ocamlinit.mk
+++ b/debian/ocamlinit.mk
@@ -36,6 +36,8 @@ OCAML_IN_FILES ?= $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debia
 # ocaml.mk, but hopefully they will be removed at some point in the
 # future
 
+-include $(CURDIR)/config/Makefile
+
 OCAMLINIT_SED := \
   -e 's%@OCamlABI@%$(OCAML_ABI)%g' \
   -e 's%@OCamlStdlibDir@%$(OCAML_STDLIB_DIR)%g' \
@@ -60,7 +62,7 @@ else
 endif
 
 ocamlinit: ocamlinit-stamp
-ocamlinit-stamp:
+ocamlinit-stamp: config/Makefile
 	for t in $(OCAML_IN_FILES); do \
 	  sed $(OCAMLINIT_SED) $$t.in > $$t; \
 	done
diff --git a/debian/rules b/debian/rules
index a315242..2176cdb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,9 +35,6 @@ else
   OCAML_NATDYNLINK := no
 endif
 
-# dh_ocamlinit cannot be used for ocaml itself
-include debian/ocamlinit.mk
-
 MD5SUMSDIR = /var/lib/ocaml/md5sums
 INSTDIR = $(CURDIR)/debian/tmp/usr
 DISTDIR = $(PACKAGE)-$(OCAML_ABI)
@@ -89,8 +86,6 @@ CONFIGURE_SED := \
 build:
 	dh $@
 
-ocamlinit-stamp: $(TARBALL_TARGET)
-
 # Generate ocaml-native-compilers' Architecture field.
 # Should never be called automatically.
 .PHONY: debian/control
@@ -131,13 +126,16 @@ $(TARBALL_TARGET): $(UPSTREAM_TARBALL)
 endif
 
 .PHONY: override_dh_auto_configure
-override_dh_auto_configure: config-stamp
+override_dh_auto_configure: config-stamp ocamlinit-stamp
 
-config-stamp: pre-config-stamp ocamlinit-stamp
+config-stamp: pre-config-stamp
 	./configure $(CONFIGURE_OPTS)
 	sed -i $(CONFIGURE_SED) config/Makefile
 	touch $@
 
+ocamlinit-stamp: $(TARBALL_TARGET) config-stamp
+	$(MAKE) -f $(CURDIR)/debian/ocamlinit.mk ocamlinit-stamp
+
 .PHONY: override_dh_auto_build
 override_dh_auto_build: build-stamp
 
@@ -167,11 +165,12 @@ endif
 	touch $@
 
 .PHONY: override_dh_auto_clean
-override_dh_auto_clean: ocamlinit-clean
+override_dh_auto_clean:
 ifneq ($(wildcard $(CURDIR)/config/Makefile),)
 	$(MAKE) clean
 	$(MAKE) -C emacs clean
 endif
+	$(MAKE) -f $(CURDIR)/debian/ocamlinit.mk ocamlinit-clean
 # Restore files altered by the build process
 	if test -d boot.debian; then \
 	  rm -Rf boot; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git