Fix cross-compilation with ocamldoc enabled.

(Peter 'whitequark' Zotov)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16486 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

Changes

@@ -102,6 +102,8 @@ Standard library:
   (Guillaume Bury)
 - GPR#239: remove type-unsafe code from Stream
   (Pierre Chambart, review by Gabriel Scherer and Jeremy Yallop)
+- GPR#250: Check for negative start element in Array.sub
+  (report and fix by Jeremy Yallop)
 
 Type system:
 - PR#5545: Type annotations on methods cannot control the choice of abbreviation
@@ -197,8 +199,8 @@ Bug fixes:
   (Pierre Chambart, Mark Shinwell)
 - GPR#249: fix a few hardcoded ar commands
   (Daniel Bünzli)
-- GPR#250: Check for negative start element in Array.sub
-  (report and fix by Jeremy Yallop)
+- GPR#251: fix cross-compilation with ocamldoc enabled
+  (whitequark)
 
 Features wishes:
 - PR#4714: List.cons

ocamldoc/Makefile

@@ -31,7 +31,11 @@ OCAMLPP=-pp './remove_DEBUG'
 MKDIR=mkdir -p
 CP=cp -f
 OCAMLDOC=ocamldoc
-OCAMLDOC_RUN=sh ./runocamldoc $(SUPPORTS_SHARED_LIBRARIES)
+ifeq ($(TARGET) & $(SUPPORTS_SHARED_LIBRARIES),$(HOST) & true)
+OCAMLDOC_RUN=$(CAMLRUN) -I ../otherlibs/unix -I ../otherlibs/str $(OCAMLDOC)
+else
+OCAMLDOC_RUN=$(CAMLRUN) $(OCAMLDOC)
+endif
 OCAMLDOC_OPT=$(OCAMLDOC).opt
 OCAMLDOC_LIBCMA=odoc_info.cma
 OCAMLDOC_LIBCMI=odoc_info.cmi

ocamldoc/runocamldoc

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-#######################################################################
-#                                                                     #
-#                                OCaml                                #
-#                                                                     #
-#            Xavier Leroy, projet Cristal, INRIA Rocquencourt         #
-#                                                                     #
-#  Copyright 2002 Institut National de Recherche en Informatique et   #
-#  en Automatique.  All rights reserved.  This file is distributed    #
-#  under the terms of the Q Public License version 1.0.               #
-#                                                                     #
-#######################################################################
-
-case "$1" in
-  true) shift
-        exec ../boot/ocamlrun  -I ../otherlibs/unix -I ../otherlibs/str \
-             ./ocamldoc "$@"
-        ;;
-     *) shift
-        exec ./ocamldoc "$@"
-        ;;
-esac