Install *.cmxs (and matching *.cma) in ocaml-base-*

diff --git a/debian/ocaml-base-nox.files.in b/debian/ocaml-base-nox.files.in
index 8f546d1c77a63249ffe052c6db1e61f05da55802..6c65c98328af685410859b4df413e58e1b18a426 100644 (file)
--- a/debian/ocaml-base-nox.files.in
+++ b/debian/ocaml-base-nox.files.in
@@ -8,3 +8,13 @@ usr/lib/ocaml/#OcamlABI#/stublibs/dllvmthreads.so
 usr/lib/ocaml/#OcamlABI#/stublibs/dllmldbm.so
 usr/lib/ocaml/#OcamlABI#/stublibs/dllnums.so
 usr/lib/ocaml/#OcamlABI#/ld.conf
+OPT: usr/lib/ocaml/#OcamlABI#/dbm.cmxs
+OPT: usr/lib/ocaml/#OcamlABI#/unix.cmxs
+OPT: usr/lib/ocaml/#OcamlABI#/str.cmxs
+OPT: usr/lib/ocaml/#OcamlABI#/bigarray.cmxs
+OPT: usr/lib/ocaml/#OcamlABI#/nums.cmxs
+usr/lib/ocaml/#OcamlABI#/dbm.cma
+usr/lib/ocaml/#OcamlABI#/unix.cma
+usr/lib/ocaml/#OcamlABI#/str.cma
+usr/lib/ocaml/#OcamlABI#/bigarray.cma
+usr/lib/ocaml/#OcamlABI#/nums.cma

diff --git a/debian/ocaml-base.files.in b/debian/ocaml-base.files.in
index 635cff9f7b86c966137821a5849f8c92610ca170..30aebbc1bec5ced8937991c38c1ebef7d5f42a55 100644 (file)
--- a/debian/ocaml-base.files.in
+++ b/debian/ocaml-base.files.in
@@ -1,3 +1,5 @@
 usr/lib/ocaml/#OcamlABI#/stublibs/dllgraphics.so
 usr/lib/ocaml/#OcamlABI#/stublibs/dlllabltk.so
 usr/lib/ocaml/#OcamlABI#/stublibs/dlltkanim.so
+OPT: usr/lib/ocaml/#OcamlABI#/graphics.cmxs
+usr/lib/ocaml/#OcamlABI#/graphics.cma

diff --git a/debian/ocaml-interp.files.in b/debian/ocaml-interp.files.in
index a116bb36ab09d59d5ce54c48fbf795f5eac69e84..2dc610c38eb66d5d24478abe8b7f574f16a6de1a 100644 (file)
--- a/debian/ocaml-interp.files.in
+++ b/debian/ocaml-interp.files.in
@@ -48,16 +48,12 @@ usr/lib/ocaml/#OcamlABI#/toplevellib.cma
 usr/lib/ocaml/#OcamlABI#/toploop.cmi
 usr/lib/ocaml/#OcamlABI#/topdirs.cmi
 usr/lib/ocaml/#OcamlABI#/topmain.cmi
-usr/lib/ocaml/#OcamlABI#/unix.cma
 usr/lib/ocaml/#OcamlABI#/unix.cmi
 usr/lib/ocaml/#OcamlABI#/unixLabels.cmi
-usr/lib/ocaml/#OcamlABI#/str.cma
 usr/lib/ocaml/#OcamlABI#/str.cmi
 usr/lib/ocaml/#OcamlABI#/dynlink.cmi
 usr/lib/ocaml/#OcamlABI#/dynlink.cma
 usr/lib/ocaml/#OcamlABI#/bigarray.cmi
-usr/lib/ocaml/#OcamlABI#/bigarray.cma
-usr/lib/ocaml/#OcamlABI#/nums.cma
 usr/lib/ocaml/#OcamlABI#/big_int.cmi
 usr/lib/ocaml/#OcamlABI#/nat.cmi
 usr/lib/ocaml/#OcamlABI#/num.cmi

diff --git a/debian/ocaml.files.in b/debian/ocaml.files.in
index d7c4e14c1065fb918924fd26aeb278725140b186..b03dc2fa3c564f2edf251f576792fa569d17dd0d 100644 (file)
--- a/debian/ocaml.files.in
+++ b/debian/ocaml.files.in
@@ -1,6 +1,5 @@
 usr/bin/labltk
 usr/bin/ocamlbrowser
-usr/lib/ocaml/#OcamlABI#/graphics.cma
 usr/lib/ocaml/#OcamlABI#/graphics.cmi
 usr/lib/ocaml/#OcamlABI#/graphicsX11.cmi
 usr/lib/ocaml/#OcamlABI#/graphics.mli

diff --git a/debian/rules b/debian/rules
index ca45dbb7febc0a6d206836808e38f28895517fa2..5b3d228de880639e66097247ac283fc42cf0ed30 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ export DH_OPTIONS
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+THIS_NATIVE_ARCH    ?= $(findstring $(DEB_BUILD_ARCH),$(NATIVE_ARCHS))
 
 CFLAGS = -Wall -g
 
@@ -35,10 +36,16 @@ endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
+ifeq (,$(THIS_NATIVE_ARCH))
+       SED_HANDLE_OPT := -e '/^OPT: /d'
+else
+       SED_HANDLE_OPT := -e 's/^OPT: //'
+endif
 
 abi-sed:
        for t in `find debian/ -name \*.in | grep -v debian/control.in`; do \
-         sed -e 's%#OcamlABI#%$(OCAMLABI)%' -e 's%#OcamlMAJOR#%$(OCAMLMAJOR)%' $$t >$${t%.in}; \
+         sed -e 's%#OcamlABI#%$(OCAMLABI)%' -e 's%#OcamlMAJOR#%$(OCAMLMAJOR)%' \
+           $(SED_HANDLE_OPT) $$t >$${t%.in}; \
        done
        touch $@
 
@@ -103,7 +110,7 @@ build-arch-stamp: config-stamp
        fi
        $(MAKE) world
        $(MAKE) bootstrap
-ifneq ($(findstring $(DEB_BUILD_ARCH),$(NATIVE_ARCHS)),)
+ifneq ($(THIS_NATIVE_ARCH),)
        @echo "Building native compilers"
        $(MAKE) opt opt.opt
        touch opt-built-stamp