changeset 4713:e82eef984ab8

Merge
author mduigou
date Mon, 07 Nov 2011 15:05:20 -0800
parents 48f4ee195252 5cd8b1fd7b07
children c49d62b855a1
files make/common/Release.gmk
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Release.gmk	Mon Nov 07 15:04:45 2011 -0800
+++ b/make/common/Release.gmk	Mon Nov 07 15:05:20 2011 -0800
@@ -232,7 +232,7 @@
 	 $(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \
 	 trim-image-jre trim-image-jdk \
          identify-image-jre identify-image-jdk \
-	 process-image-jre process-image-jdk sec-files sec-files-win jgss-files 
+	 process-image-jre process-image-jdk sec-files sec-files-win jgss-files
 
 # Don't use these
 image-jre:: initial-image-jre trim-image-jre identify-image-jre process-image-jre
@@ -484,7 +484,7 @@
 $(JDK_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/%
 	$(process-doc-file)
 
-# JRE files 
+# JRE files
 $(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%
 	$(process-doc-file)
 ifeq ($(PLATFORM), windows)
@@ -694,7 +694,7 @@
 	 $(CD) $(CLASSBINDIR) && if [ -d $(DEFENDER_WEAVER_DIR) ] ; then \
 		$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(RT_JAR_MANIFEST_FILE) $(ABS_TEMPDIR)/rt-preweave.jar \
 		    @$(RT_JAR_FILELIST) $(BOOT_JAR_JFLAGS) && \
-		$(BOOT_JAVA_CMD) -cp $(DEFENDER_WEAVER_DIR)/distrib/jsr335-agent.jar:$(DEFENDER_WEAVER_DIR)/lib/asm-all-4.0.jar jsr335.agent.batch.Main \
+		$(BOOT_JAVA_CMD) -cp $(DEFENDER_WEAVER_DIR)/distrib/jsr335-agent.jar$(CLASSPATH_SEPARATOR)$(DEFENDER_WEAVER_DIR)/lib/asm-all-4.0.jar jsr335.agent.batch.Main \
 		   -v -d $@ $(ABS_TEMPDIR)/rt-preweave.jar ;\
 	else \
 	   echo "# defender weaver not found"; \