diff -r 09634c9cbf3c -r e5b407ff3100 src/FOL/IsaMakefile
--- a/src/FOL/IsaMakefile	Mon Jan 06 17:02:09 1997 +0100
+++ b/src/FOL/IsaMakefile	Tue Jan 07 09:00:26 1997 +0100
@@ -7,6 +7,7 @@
 OUT = $(ISABELLE_OUTPUT_DIR)
 
 FILES =	ROOT.ML IFOL.thy IFOL.ML FOL.thy FOL.ML intprover.ML simpdata.ML \
+	thy_data.ML cladata.ML \
 	../Provers/hypsubst.ML ../Provers/classical.ML \
 	../Provers/simplifier.ML ../Provers/splitter.ML ../Provers/ind.ML
 
@@ -16,14 +17,13 @@
 
 
 $(OUT)/FOL: $(OUT)/Pure $(FILES)
-	@$(ISABELLE_HOME)/bin/isabelle -e "make_html := $(ISABELLE_HTML);" -qu Pure FOL
+	@$(ISABELLE) -e "make_html := $(ISABELLE_HTML);" -qu $(OUT)/Pure FOL
 	@chmod -w $@
 
 $(OUT)/Pure:
-	@cd ../Pure; $(ISABELLE_HOME)/bin/isatool make
+	@cd ../Pure; $(ISATOOL) make
 
 test: ex/ROOT.ML $(OUT)/FOL $(EX_FILES)
-	@$(ISABELLE_HOME)/bin/isabelle -e "make_html := $(ISABELLE_HTML);" \
-	  -e 'exit_use_dir "ex"; quit();' -rq FOL
+	@$(ISATOOL) testdir $(OUT)/FOL ex
 
 .PRECIOUS: $(OUT)/Pure $(OUT)/FOL