# HG changeset patch
# User wenzelm
# Date 1246222289 -7200
# Node ID cc7ddda02436d5126d5df69830aa4efb55c497cc
# Parent  3d5e51dbafe905b154e2fc132987269fc586b911
more precise dependencies for "jars";
allow spaces in SCALA_HOME;

diff -r 3d5e51dbafe9 -r cc7ddda02436 src/Pure/IsaMakefile
--- a/src/Pure/IsaMakefile	Sun Jun 28 22:50:37 2009 +0200
+++ b/src/Pure/IsaMakefile	Sun Jun 28 22:51:29 2009 +0200
@@ -127,22 +127,23 @@
   Tools/isabelle_syntax.scala
 
 
-SCALA_TARGET = $(ISABELLE_HOME)/lib/classes/Pure.jar
-ISABELLE_SCALA = $(ISABELLE_HOME)/lib/classes/isabelle-scala.jar
+JAR_DIR = $(ISABELLE_HOME)/lib/classes
+PURE_JAR = $(JAR_DIR)/Pure.jar
+FULL_JAR = $(JAR_DIR)/isabelle-scala.jar
 
-jars: $(SCALA_TARGET)
+jars: $(FULL_JAR)
 
-$(SCALA_TARGET): $(SCALA_FILES)
+$(FULL_JAR): $(SCALA_FILES)
 	@rm -rf classes && mkdir classes
-	$(SCALA_HOME)/bin/scalac -deprecation -d classes -target jvm-1.5 $(SCALA_FILES)
-	$(SCALA_HOME)/bin/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`; \
-          cp $(SCALA_HOME)/lib/scala-library.jar $(ISABELLE_SCALA); \
-          jar ufe `jvmpath $(ISABELLE_SCALA)` isabelle.GUI_Setup isabelle scala
+	@mkdir -p "$(JAR_DIR)"
+	@cd classes; jar cfe `jvmpath "$(PURE_JAR)"` isabelle.GUI_Setup isabelle
+	@cd classes; cp "$(SCALA_HOME)/lib/scala-swing.jar" .; jar xf scala-swing.jar; \
+          cp "$(SCALA_HOME)/lib/scala-library.jar" "$(FULL_JAR)"; \
+          jar ufe `jvmpath $(FULL_JAR)` isabelle.GUI_Setup isabelle scala
 	@rm -rf classes
 
 clean-jars:
-	@rm -f $(SCALA_TARGET) $(ISABELLE_SCALA)
+	@rm -f "$(PURE_JAR)" "$(FULL_JAR)"