From 7bf9bbe2968802b48230d35d34c585201ee9e9b4 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sun, 25 Oct 2015 15:24:43 +0100
Subject: Seeing configure as a static resolution of path, hence hardwiring
 long paths for ocaml* executables in the generated config/Makefile.

Hoping I'm not doing something wrong. E.g., I don't see why it would
not be ok for windows or macosx too, since e.g. camlp5o was already
with a full path.
---
 configure.ml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ml b/configure.ml
index 1945167168..37c45f3e62 100644
--- a/configure.ml
+++ b/configure.ml
@@ -476,7 +476,10 @@ let camlbin, caml_version, camllib =
     rebase_camlexec dir camlexec;
     Filename.dirname camlexec.byte, camlexec.byte
   | None ->
-    try let camlc = which camlexec.byte in Filename.dirname camlc, camlc
+    try let camlc = which camlexec.byte in
+        let dir = Filename.dirname camlc in
+        rebase_camlexec dir camlexec;
+        dir, camlc
     with Not_found ->
       die (sprintf "Error: cannot find '%s' in your path!\n" camlexec.byte ^
            "Please adjust your path or use the -camldir option of ./configure")
-- 
cgit v1.2.3