--- a/src/Pure/IsaMakefile Sun Jun 28 17:42:22 2009 +0200
+++ b/src/Pure/IsaMakefile Sun Jun 28 17:55:44 2009 +0200
@@ -130,19 +130,19 @@
SCALA_TARGET = $(ISABELLE_HOME)/lib/classes/Pure.jar
ISABELLE_SCALA = $(ISABELLE_HOME)/lib/classes/isabelle-scala.jar
-jar: $(SCALA_TARGET)
+jars: $(SCALA_TARGET)
$(SCALA_TARGET): $(SCALA_FILES)
@rm -rf classes && mkdir classes
- scalac -deprecation -d classes -target jvm-1.5 $(SCALA_FILES)
- scaladoc -d classes $(SCALA_FILES)
+ $(SCALA_HOME)/bin/scalac -deprecation -d classes -target jvm-1.5 $(SCALA_FILES)
+ $(SCALA_HOME)/bin/scaladoc -d classes $(SCALA_FILES)
@cp $(SCALA_FILES) classes/isabelle
@mkdir -p `dirname $@`
- cd classes; jar cfe `jvmpath $@` isabelle.GUI_Setup isabelle
- cd classes; jar xf `jvmpath $(SCALA_HOME)/lib/scala-swing.jar`; \
+ @cd classes; jar cfe `jvmpath $@` isabelle.GUI_Setup isabelle
+ @cd classes; jar xf `jvmpath $(SCALA_HOME)/lib/scala-swing.jar`; \
cp $(SCALA_HOME)/lib/scala-library.jar $(ISABELLE_SCALA); \
jar ufe `jvmpath $(ISABELLE_SCALA)` isabelle.GUI_Setup isabelle scala
@rm -rf classes
-clean-jar:
+clean-jars:
@rm -f $(SCALA_TARGET) $(ISABELLE_SCALA)