--- mlton/Makefile	2007-08-26 23:04:00.000000000 +0200
+++ mlton/Makefile	2007-11-10 20:19:54.000000000 +0100
@@ -12,7 +12,7 @@
 HOST_ARCH := $(shell "$(SRC)/bin/host-arch")
 HOST_OS := $(shell "$(SRC)/bin/host-os")
 LIB := $(BUILD)/lib
-MLTON := mlton
+MLTON := ../../usr/bin/mlton
 TARGET := self
 AOUT := mlton-compile
 UP := upgrade-basis.sml
@@ -43,12 +43,12 @@
 endif
 endif
 
-ifeq (new,$(shell PATH="$(BIN):$$PATH"; mlton -target self >/dev/null 2>&1 && echo new))
+ifeq (new,$(shell PATH="$(BIN):$$PATH"; $(MLTON) -target self >/dev/null 2>&1 && echo new))
   FLAGS += -target $(TARGET)
 else
   FLAGS += -host $(TARGET)
 endif
-ifeq (new,$(shell PATH="$(BIN):$$PATH"; mlton -verbose 1 >/dev/null 2>&1 && echo new))
+ifeq (new,$(shell PATH="$(BIN):$$PATH"; $(MLTON) -verbose 1 >/dev/null 2>&1 && echo new))
   FLAGS += -verbose 2 -output "$(AOUT)"
 else
   FLAGS += -v -o "$(AOUT)"
@@ -64,7 +64,7 @@
 	front-end/mlb.lex.sml 	\
 	front-end/mlb.grm.sig 	\
 	front-end/mlb.grm.sml	\
-	$(shell if [ -r $(FILE) ]; then mlton -stop f $(FILE); fi)
+	$(shell if [ -r $(FILE) ]; then $(MLTON) -stop f $(FILE); fi)
 
 .PHONY: all
 all: $(AOUT)
@@ -82,7 +82,7 @@
 	rm -f $(UP)
 	$(MAKE) $(UP)
 	@echo 'Compiling mlton (takes a while)'
-	mlton $(FLAGS) $(FILE)
+	$(MLTON) $(FLAGS) $(FILE)
 
 #! Pass $(PATH) to upgrade-basis because it is run via #!/usr/bin/env
 # bash, which resets the path.
@@ -90,11 +90,11 @@
 	"$(SRC)/bin/upgrade-basis" '$(PATH)' "$(HOST_ARCH)" "$(HOST_OS)" >$(UP)
 
 mlton.sml: $(SOURCES)
-	rm -f mlton.sml && mlton -stop sml mlton.cm && chmod -w mlton.sml
+	rm -f mlton.sml && $(MLTON) -stop sml mlton.cm && chmod -w mlton.sml
 
 .PHONY: def-use
 def-use:
-	mlton -stop tc -prefer-abs-paths true -show-def-use mlton.def-use $(FILE)
+	$(MLTON) -stop tc -prefer-abs-paths true -show-def-use mlton.def-use $(FILE)
 
 .PHONY: clean
 clean:
@@ -168,5 +168,5 @@
 
 .PHONY: warn
 warn:
-	mlton -stop tc -default-ann 'warnUnused true' $(FILE) \
+	$(MLTON) -stop tc -default-ann 'warnUnused true' $(FILE) \
 		>/tmp/z.warn 2>&1