--- mercury-tests-0.13.1.orig/Mmake.common	2006-01-25 20:03:44.000000000 +1300
+++ mercury-tests-0.13.1/Mmake.common	2007-01-16 22:04:32.000000000 +1300
@@ -73,8 +73,8 @@
 -include $(TESTS_DIR)/Mmake.params
 
 MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
-ifdef WORKSPACE_FLAGS
-MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS
+ifdef WORKSPACE
+MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS.ws
 endif
 
 # Avoid trying to make this file with `mmc --make' if it doesn't exist.
--- mercury-compiler-0.13.1.orig/configure	2006-12-01 09:37:01.000000000 +0000
+++ mercury-compiler-0.13.1/configure	2008-08-21 03:17:23.000000000 +0000
@@ -12301,9 +12301,9 @@
 then
 	test_flags="tests/TESTS_FLAGS"
 else
-	if test -e ../tests/TESTS_FLAGS.in
+	if test -e ../mercury-tests-0.13.1/TESTS_FLAGS.in
 	then
-		test_flags="../tests/TESTS_FLAGS"
+		test_flags="../mercury-tests-0.13.1/TESTS_FLAGS"
 	else
 		test_flags=""
 	fi