Add support of pmake to our OCaml toolchain

Closes #25
foretspaisibles · Jun 27, 2014 · 1c7b760 · 1c7b760
1 parent ed2b7e3
commit 1c7b760
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/ocaml/ocaml.build.mk b/ocaml/ocaml.build.mk
@@ -227,7 +227,7 @@ _OCAML_BUILD.${obj:T}+=${${var}.${obj:T}}
 
 .endif
 
-.if !empty(_OCAML_CMXA:M${obj})
+.if defined(_OCAML_CMXA)&&!empty(_OCAML_CMXA:M${obj})
 # We are producing a CMXA file
 clib:=${obj:C/.cmxa/.a/}
 .if !target(${clib})

diff --git a/ocaml/ocaml.yacc.mk b/ocaml/ocaml.yacc.mk
@@ -56,12 +56,12 @@ CLEANFILES+= ${file}
 .endif
 .endfor
 .for mod in ${_OCAML_MLY:.mly=.ml}
-.if empty(_OCAML_ML:M${mod})
+.if !defined(_OCAML_ML)||empty(_OCAML_ML:M${mod})
 _OCAML_ML+= ${mod}
 .endif
 .endfor
 .for if in ${_OCAML_MLY:.mly=.mli}
-.if empty(_OCAML_MLI:M${if})
+.if !defined(_OCAML_MLI)||empty(_OCAML_MLI:M${if})
 _OCAML_MLI+= ${if}
 .endif
 .endfor

diff --git a/test/ocaml/Makefile b/test/ocaml/Makefile
@@ -37,9 +37,7 @@ SUBDIR+=	miniproj-3
 COMPILE?=	byte_code
 
 TESTENV=	${ENVTOOL} -i "PATH=${PATH}" "COMPILE=${COMPILE}"
-.for prefix in ${PREFIX}
-TESTENV+=	"MAKEFLAGS=${MAKEFLAGS:NPACKAGE*:NPROJECT*:N-I${prefix}/share/mk}"
-.endfor
+TESTENV+=	"MAKEFLAGS=${MAKEFLAGS:NPACKAGE*:NPROJECT*}"
 
 test-clean:
 	${TESTENV} ${MAKE} realclean