[MLton-commit] r7127

[Matthew Fluet]

Copy mlton-polyml via root Makefile.
----------------------------------------------------------------------

U   mlton/trunk/Makefile
U   mlton/trunk/mlton/.ignore
U   mlton/trunk/mlton/Makefile

----------------------------------------------------------------------

Modified: mlton/trunk/Makefile
===================================================================
--- mlton/trunk/Makefile	2009-06-11 03:23:34 UTC (rev 7126)
+++ mlton/trunk/Makefile	2009-06-11 03:23:36 UTC (rev 7127)
@@ -176,6 +176,7 @@
 polyml-mlton:
 	$(MAKE) dirs runtime
 	$(MAKE) -C "$(COMP)" polyml-mlton
+	$(CP) "$(COMP)/polyml-mlton$(EXE)" "$(LIB)/"
 	$(MAKE) script basis-no-check mlbpathmap targetmap constants libraries-no-check
 	@echo 'Build of MLton succeeded.'
 

Modified: mlton/trunk/mlton/.ignore
===================================================================
--- mlton/trunk/mlton/.ignore	2009-06-11 03:23:34 UTC (rev 7126)
+++ mlton/trunk/mlton/.ignore	2009-06-11 03:23:36 UTC (rev 7127)
@@ -1,5 +1,7 @@
 mlton-compile
 mlton-compile.exe
+mlton-polyml
+mlton-polyml.exe
 mlton-polyml.use
 mlton-stubs.mlb
 upgrade-basis.sml

Modified: mlton/trunk/mlton/Makefile
===================================================================
--- mlton/trunk/mlton/Makefile	2009-06-11 03:23:34 UTC (rev 7126)
+++ mlton/trunk/mlton/Makefile	2009-06-11 03:23:36 UTC (rev 7127)
@@ -161,7 +161,7 @@
 		echo 'use "mlton-polyml.use";';					\
 		echo 'PolyML.export("mlton-polyml", Main.mainWrapped);';	\
 	) | "$(POLYML)"
-	$(CC) -o $(LIB)/mlton-polyml mlton-polyml.o -lpolymain -lpolyml
+	$(CC) -o mlton-polyml mlton-polyml.o -lpolymain -lpolyml
 	rm -f mlton-polyml.o
 
 mlton-polyml.use: ../lib/stubs/basis-stubs-for-polyml/sources.use ../lib/stubs/mlton-stubs-for-polyml/sources.use $(shell mlton -stop f ../lib/stubs/mlton-stubs/sources.mlb) $(shell mlton -stop f mlton.mlb)