From 2f962277d1c9a17ac3355d71be7e0b8555c90760 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Thu, 30 Aug 2007 13:11:24 +0000 Subject: [PATCH] add a fallback in case the binaries are in the path and not in the runtime base dir --- helm/software/matita/matitamakeLib.ml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/helm/software/matita/matitamakeLib.ml b/helm/software/matita/matitamakeLib.ml index ee04e7878..c2fff07a4 100644 --- a/helm/software/matita/matitamakeLib.ml +++ b/helm/software/matita/matitamakeLib.ml @@ -146,9 +146,14 @@ let rebuild_makefile development = HExtlib.input_file BuildTimeConf.matitamake_makefile_template in let ext = Lazy.force am_i_opt in - let cc = BuildTimeConf.runtime_base_dir ^ "/matitac" ^ ext in - let rm = BuildTimeConf.runtime_base_dir ^ "/matitaclean" ^ ext in - let mm = BuildTimeConf.runtime_base_dir ^ "/matitadep" ^ ext in + let binpath = + if HExtlib.is_executable + (BuildTimeConf.runtime_base_dir ^ "/matitac" ^ ext) + then BuildTimeConf.runtime_base_dir ^ "/" else "" + in + let cc = binpath ^ "matitac" ^ ext in + let rm = binpath ^ "matitaclean" ^ ext in + let mm = binpath ^ "matitadep" ^ ext in let df = pool () ^ development.name ^ "/depend" in let template = Pcre.replace ~pat:"@ROOT@" ~templ:development.root template in let template = Pcre.replace ~pat:"@CC@" ~templ:cc template in -- 2.39.2