Commit 3e960d12 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Minor changes in Makefile so that luciole works out-of-the box in the distributed tgz

parent 874bebce
......@@ -34,6 +34,8 @@ slink:
rm -rf lib && ln -sf pre_release/$(HOSTTYPE)/lib
rm -rf include && ln -sf pre_release/$(HOSTTYPE)/include
cp -rf $(LOCAL_INSTALL)/lib/* $(LIB_INSTALL_DIR)
cp -rf $(LUSTRE_INSTALL)/lib/tcl* $(LIB_INSTALL_DIR)
cp -rf $(LUSTRE_INSTALL)/lib/tk* $(LIB_INSTALL_DIR)
cp -rf $(LOCAL_INSTALL)/include/* $(INC_INSTALL_DIR)
cpcomp:
......
......@@ -108,6 +108,7 @@ ifeq ($(HOSTTYPE),win32)
CFLAGS=-g -O2 -fpic -DWIN32 -DPOLKA_NUM=3
DWIN32 =
RANLIB=/usr/i586-mingw32msvc/bin/ranlib
OCAMLOPT=/usr/i586-mingw32msvc/bin/ocamlopt
OCAMLC=/usr/i586-mingw32msvc/bin/ocamlc
OCAMLDEP=/usr/i586-mingw32msvc/bin/ocamldep
......@@ -154,7 +155,8 @@ ifeq ($(HOSTTYPE),win32)
OCAMLLIB = `$(OCAMLC) -where`
OCAMLLIB="e:\ocaml\Objective Caml\lib"
CAML_INSTALL_DIR=`$(OCAMLC) -where`
RANLIB=ranlib
GCC=gcc
DWIN32 = -DWIN32
else
......
......@@ -89,9 +89,9 @@ let (c2dro: string -> bool) =
let dro = base ^ ".dro" in
let include_dir = Filename.concat lurette_path "include" in
try
let cc = try mygetenv "GCC" with Not_found -> "gcc" in
ignore (Util.my_create_process ~std_out:Unix.stderr ~wait:true cc
[cfile; "-shared"; "-o"; dro; "-I"; include_dir ]);
let cc = mygetenv_def "gcc" "GCC" in
ignore (Util.my_create_process ~std_out:Unix.stderr ~wait:true cc
[cfile; "-shared"; "-o"; dro; "-I"; include_dir ]);
true
with e ->
print_string (Printexc.to_string e);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment