New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge build systems in the byterun directory #981

Merged
merged 24 commits into from Dec 29, 2016
Commits
Jump to file or symbol
Failed to load files and symbols.
+4 −6
Diff settings

Always

Just for now

Viewing a subset of changes. View all

byterun/Makefile.shared: gather variable declarations

  • Loading branch information...
shindere committed Dec 14, 2016
commit c375606abb7306eee9c6cbcd1bc5e11201de458a
View
@@ -14,6 +14,10 @@
#**************************************************************************
include ../config/Makefile
INSTALL_BINDIR=$(DESTDIR)$(BINDIR)
INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
CAMLRUN ?= ../boot/ocamlrun
CC=$(BYTECC)
@@ -50,12 +54,6 @@ ld.conf: ../config/Makefile
echo "$(STUBLIBDIR)" > $@
echo "$(LIBDIR)" >> $@
# Installation
INSTALL_BINDIR=$(DESTDIR)$(BINDIR)
INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
.PHONY: install
install::
cp $(CAMLRUN)$(EXE) "$(INSTALL_BINDIR)/ocamlrun$(EXE)"
ProTip! Use n and p to navigate between commits in a pull request.