aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhattenberger2013-03-12 09:52:10 +0000
committerhattenberger2013-03-12 09:52:10 +0000
commit003d66dc1fabc063372e4f03265935d0ccaefd78 (patch)
treed205e1c3d0eecc35455a169529653189f8207274
parent09ecabd57e3c16cf46058eecd19488751e61844c (diff)
downloadivy-ocaml-003d66dc1fabc063372e4f03265935d0ccaefd78.zip
ivy-ocaml-003d66dc1fabc063372e4f03265935d0ccaefd78.tar.gz
ivy-ocaml-003d66dc1fabc063372e4f03265935d0ccaefd78.tar.bz2
ivy-ocaml-003d66dc1fabc063372e4f03265935d0ccaefd78.tar.xz
patch for macosx
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 5be60dc..f86591f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,10 @@ COMPAT_SYMLINK_CREATE ?= y
# For linux, nothing; for darwin "site-lib/" with trailing slash
COMPAT_SYMLINK_SRCMOD ?=
-DEBUG = n
+# Specify default Macports path on OS X
+OSX_MACPORTS_PREFIX ?= /opt/local
+
+DEBUG ?= n
OCAMLC = ocamlc
@@ -41,7 +44,7 @@ endif
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
ifeq ($(uname_S),Darwin)
- LIBRARYS = -L/opt/local/lib
+ LIBRARYS = -L$(OSX_MACPORTS_PREFIX)/lib
endif
@@ -138,7 +141,7 @@ tkivy-ocaml.cmxa : $(TKIVYCMX) civy.o ctkivy.o
.ml.cmo :
$(OCAMLC) $(OCAMLFLAGS) $(INCLUDES) -c $<
.c.o :
- $(CC) -Wall -c $(FPIC) -I /opt/local/include/ $(OCAMLINC) $(GLIBINC) $<
+ $(CC) -Wall -c $(FPIC) -I $(OSX_MACPORTS_PREFIX)/include/ $(OCAMLINC) $(GLIBINC) $<
.mli.cmi :
$(OCAMLMLI) $(OCAMLFLAGS) -c $<
.ml.cmx :