[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/4.00.0__dev15+12379-1-19-g8329789

Stephane Glondu steph at glondu.net
Thu Jun 14 06:47:38 UTC 2012


The following commit has been merged in the experimental/master branch:
commit e680625f99b971f8c73fde27d24a8a9a54a7092d
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Apr 20 07:59:42 2012 +0200

    Remove files that make no sense without ocamlopt
    
    Their presence combined with dh_install --fail-missing cause FTBFS on
    bytecode architectures...

diff --git a/debian/rules b/debian/rules
index 234885b..db89c5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -214,6 +214,13 @@ ifeq (,$(DEB_TEST_BUILD_PREFIX))
 	  $(INSTDIR)/share/man/man1/ocamlopt.opt.1 \
 	  $(INSTDIR)/share/man/man1/ocamlc.opt.1 \
 	  $(INSTDIR)/bin/camlp4boot
+ifeq ($(OCAML_HAVE_OCAMLOPT),no)
+# Remove files that make no sense without ocamlopt
+	rm -f \
+	  $(INSTDIR)/share/man/man1/ocamloptp.1 \
+	  $(INSTDIR)/share/man/man1/ocamlopt.1 \
+	  $(INSTDIR)/bin/ocamloptp
+endif
 # Dispatch files with dh_install
 	cd debian && \
 	for u in ocaml ocaml-nox; do \

-- 
OCaml packaging



More information about the Pkg-ocaml-maint-commits mailing list