1. camlspotter
  2. ojacare

Commits

camlspotter  committed 64c6a4b

bug fix of Makefiles

  • Participants
  • Parent commits b98a6e3
  • Branches original

Comments (0)

Files changed (2)

File camljava-0.3/lib/Makefile

View file
 OCAMLOPT=ocamlopt
 OCAMLDEP=ocamldep
 OCAMLLIB=`ocamlc -where`
-CAMLJAVALIB=$(OCAMLLIB)/site-lib/camljava
+CAMLJAVALIB=$(shell ocamlfind printconf destdir)/camljava
 
 all: jni.cma javaclasses
 opt: jni.cmxa javaclasses

File camljava-0.3/test/Makefile

View file
 include ../Makefile.config
 
-CAMLJAVA=`ocamlc -where`/camljava/camljava.jar
+CAMLJAVA=$(shell ocamlfind printconf destdir)/camljava/camljava.jar
 
 all: jnitest Test.class Testcb.class
 	./jnitest
 
 jnitest: jnitest.ml
-	ocamlc -ccopt -g -o jnitest -I +camljava jni.cma jnitest.ml
+	ocamlfind ocamlc -package camljava -g -o jnitest jni.cma jnitest.ml
 
 clean::
 	rm -f jnitest