[MLton-commit] r7128

[Matthew Fluet]

Copy mlton-smlnj 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:36 UTC (rev 7127)
+++ mlton/trunk/Makefile	2009-06-11 03:23:38 UTC (rev 7128)
@@ -228,6 +228,7 @@
 smlnj-mlton:
 	$(MAKE) dirs runtime
 	$(MAKE) -C "$(COMP)" smlnj-mlton
+	smlnj_heap_suffix=`echo 'TextIO.output (TextIO.stdErr, SMLofNJ.SysInfo.getHeapSuffix ());' | sml 2>&1 1> /dev/null` && $(CP) "$(COMP)/mlton-smlnj.$$smlnj_heap_suffix" "$(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:36 UTC (rev 7127)
+++ mlton/trunk/mlton/.ignore	2009-06-11 03:23:38 UTC (rev 7128)
@@ -3,5 +3,6 @@
 mlton-polyml
 mlton-polyml.exe
 mlton-polyml.use
+mlton-smlnj.*-*
 mlton-stubs.mlb
 upgrade-basis.sml

Modified: mlton/trunk/mlton/Makefile
===================================================================
--- mlton/trunk/mlton/Makefile	2009-06-11 03:23:36 UTC (rev 7127)
+++ mlton/trunk/mlton/Makefile	2009-06-11 03:23:38 UTC (rev 7128)
@@ -144,7 +144,7 @@
 		echo 'if (CM.make "mlton-smlnj.cm") handle _ => false';		\
 		echo '   then ()';						\
 		echo '   else OS.Process.exit OS.Process.failure;'; 		\
-		echo 'SMLofNJ.exportFn("$(LIB)/mlton-smlnj",Main.main);'	\
+		echo 'SMLofNJ.exportFn("mlton-smlnj",Main.main);'		\
 	) | "$(SMLNJ)"
 
 #