Merge pull request #3663 from mtzguido/mk2

Makefile/opam fixes

Author: mtzguido

Makefile

@@ -253,7 +253,8 @@ __install-stage1:
 
 $(INSTALLED_FSTAR1_FULL_EXE): export FSTAR_LINK_LIBDIRS=$(LINK_OK)
 $(INSTALLED_FSTAR1_FULL_EXE): stage1-components
-	$(MAKE) __install-stage1
+	$(MAKE) __install-stage1 PREFIX=$(CURDIR)/stage1/out
+	@# ^ pass PREFIX to make sure we don't get it from env
 
 stage2-components: 2.full 2.alib.src 2.plib.src
 __install-stage2:
@@ -262,15 +263,16 @@ __install-stage2:
 
 $(INSTALLED_FSTAR2_FULL_EXE): export FSTAR_LINK_LIBDIRS=$(LINK_OK)
 $(INSTALLED_FSTAR2_FULL_EXE): stage2-components
-	$(MAKE) __install-stage2
+	$(MAKE) __install-stage2 PREFIX=$(CURDIR)/stage2/out
+	@# ^ pass PREFIX to make sure we don't get it from env
 
 setlink-%:
 	if [ -e out ] && ! [ -h out ]; then echo "ERROR: out/ exists and is not a symbolic link, please remove it"; false; fi
 	ln -Trsf stage$*/out out
 	# For compatibility with the previous layout
 	mkdir -p bin
 	ln -Trsf out/bin/fstar.exe bin/fstar.exe
-	ln -Trsf out/bin/get_fstar_z3.sh bin/get_fstar_z3.sh
+	ln -Trsf .scripts/get_fstar_z3.sh bin/get_fstar_z3.sh
 
 stage1: $(INSTALLED_FSTAR1_FULL_EXE)
 1: stage1

fstar.opam

@@ -24,7 +24,7 @@ depends: [
 ]
 depexts: ["coreutils"] {os = "macos" & os-distribution = "homebrew"}
 build: [
-  [make "PREFIX=%{prefix}%" "-j" jobs "ADMIT=1"]
+  [make "-j" jobs "ADMIT=1"]
 ]
 install: [
   [make "PREFIX=%{prefix}%" "install"]