d/rules: split install-stamp target into -arch and -indep

diff --git a/debian/changelog b/debian/changelog
index 4f3d1fd5314bf92996153a44a926fc87aff041cb..2196ed843293a897a9989d82a3ca00f9c3211747 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml (4.02.3-7) unstable; urgency=medium
+
+  * d/rules: split install-stamp target into -arch and -indep
+    (Closes: #806087).
+
+ -- Ralf Treinen <treinen@debian.org>  Fri, 15 Jul 2016 20:25:37 +0200
+
 ocaml (4.02.3-6) unstable; urgency=medium
 
   * Add x32 support (Closes: #773409)

diff --git a/debian/rules b/debian/rules
index 90ebcf039d7abf345b553c46c2ce24e8ad15a1e1..a1e56b3f3fcd64fe38c0cb8be63fff46ef91eb5b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -155,7 +155,7 @@ endif
 else
        @echo "===> WARNING: $(BUILDCACHE) detected, compilation skipped! <==="
        rsync -a --exclude=debian --exclude=.git $(BUILDCACHE)/ .
-       rm -f build-stamp install-stamp
+       rm -f build-stamp install-stamp-arch install-stamp-indep
 endif
        touch $@
 
@@ -181,10 +181,11 @@ endif
 # Remaining stuff
        -rm -Rf debian/$(SRCTARBALL) debian/examples $(TESTDIR)
 
-.PHONY: override_dh_auto_install
-override_dh_auto_install: install-stamp
+.PHONY: override_dh_auto_install-arch override_dh_auto_install-indep
+override_dh_auto_install-arch: install-stamp-arch
+override_dh_auto_install-indep: install-stamp-indep
 
-install-stamp:
+install-stamp-indep:
 ifneq (,$(findstring ocaml-mode,$(ALL_PACKAGES)))
 # Install Emacs files
        $(MAKE) -C emacs \
@@ -195,6 +196,9 @@ ifneq (,$(findstring ocaml-mode,$(ALL_PACKAGES)))
        fi
        $(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-mode/usr/bin install-ocamltags
 endif
+       touch $@
+
+install-stamp-arch:
 # Install OCaml
        $(MAKE) install PREFIX=$(INSTDIR)
 ifeq (,$(DEB_TEST_BUILD_PREFIX))