[Pkg-ocaml-maint-commits] [ocaml] 01/04: d/rules: split install-stamp target into -arch and -indep
Ralf Treinen
treinen at moszumanska.debian.org
Fri Jul 15 20:50:01 UTC 2016
This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository ocaml.
commit 2b37d5b8074e2b509938926178bf2b19046bdefa
Author: Ralf Treinen <treinen at free.fr>
Date: Fri Jul 15 20:31:08 2016 +0200
d/rules: split install-stamp target into -arch and -indep
---
debian/changelog | 7 +++++++
debian/rules | 12 ++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4f3d1fd..2196ed8 100644
--- 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 at 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 90ebcf0..a1e56b3 100755
--- 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))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git
More information about the Pkg-ocaml-maint-commits
mailing list