$NetBSD: patch-Makefile.conf,v 1.3 2015/01/20 16:09:16 jaapb Exp $ Have BINDIR be determined from package Makefile, do not call git Also determine tyxml and react usage based on options rather than detection --- Makefile.conf.orig 2014-09-30 14:40:37.000000000 +0000 +++ Makefile.conf @@ -1,6 +1,6 @@ # Where binaries are installed: -BINDIR := `dirname \`which ocamlc\`` +#BINDIR := `dirname \`which ocamlc\`` #### @@ -39,12 +39,12 @@ WITH_DERIVING ?= $(shell if [ -f `ocamlf WITH_GRAPHICS ?= $(shell if [ -f `ocamlfind query graphics 2> /dev/null`/graphics.cmi ]; then echo YES; else echo NO; fi) -WITH_REACT ?= $(shell if [ -f `ocamlfind query reactiveData 2> /dev/null`/reactiveData.cma ]; then echo YES; else echo NO; fi) -WITH_TYXML ?= $(shell if [ -f `ocamlfind query tyxml 2> /dev/null`/tyxml_f.cma ]; then echo YES; else echo NO; fi) +WITH_REACT ?= $(USE_REACT) +WITH_TYXML ?= $(USE_TYXML) NATDYNLINK ?= $(shell if [ -f `ocamlc -where`/dynlink.cmxa ]; then echo YES; else echo NO; fi) METAOCAML ?= 0 -VERSION_GIT := $(shell git log -n1 --pretty=format:%h 2> /dev/null) +#VERSION_GIT := $(shell git log -n1 --pretty=format:%h 2> /dev/null)