Mercurial > mxe-octave
diff src/ocaml-core.mk @ 3014:b6c7244a2f66
Use HOST_BINDIR, HOST_LIBDIR, and HOST_INCDIR instead of MXE_BINDIR, MXE_LIBDIR, and MXE_INCDIR. Attempt to use these variables consistently instead of using $(HOST_PREFIX)/bin, $(HOST_PREFIX)/lib, and $(HOST_PREFIX)/include
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 02 Jun 2013 16:59:24 -0400 |
| parents | 100e618349f7 |
| children | 951da75fd09c |
line wrap: on
line diff
--- a/src/ocaml-core.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/ocaml-core.mk Sun Jun 02 16:59:24 2013 -0400 @@ -27,8 +27,8 @@ # match Windows' int type. (That's what -cc and -host are for). cd '$(1)' && ./configure \ -prefix '$(HOST_PREFIX)' \ - -bindir '$(HOST_PREFIX)/bin' \ - -libdir '$(HOST_PREFIX)/lib/ocaml' \ + -bindir '$(HOST_BINDIR)' \ + -libdir '$(HOST_LIBDIR)/ocaml' \ -no-tk \ -cc "gcc -m32" \ -no-shared-libs \ @@ -45,8 +45,8 @@ $(MAKE) -C '$(1)' all # install ocamldoc and camlp4 (non cross versions) $(MAKE) -C '$(1)/ocamldoc' install - cd '$(1)' && BINDIR=$(HOST_PREFIX)/bin \ - LIBDIR=$(HOST_PREFIX)/lib/ocaml \ + cd '$(1)' && BINDIR=$(HOST_BINDIR) \ + LIBDIR=$(HOST_LIBDIR)/ocaml \ PREFIX=$(HOST_PREFIX) \ ./build/partial-install.sh @@ -113,7 +113,7 @@ $(MAKE) -C '$(1)' installopt # Rename all the binaries to target-binary for f in ocamlc ocamlcp ocamlrun ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof camlp4prof camlp4boot camlp4 camlp4oof camlp4of camlp4o camlp4rf camlp4r camlp4orf ocamldoc ; do \ - cp -f $(HOST_PREFIX)/bin/$$f $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-$$f; \ + cp -f $(HOST_BINDIR)/$$f $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-$$f; \ done # test ocamlopt