8008721: Tweaks to make all NEWBUILD=false round 4
authorjlaskey
Fri, 22 Feb 2013 10:39:00 -0400
changeset 16257 781330354161
parent 16256 f2d9a0c49914
child 16258 0e25f785df4d
8008721: Tweaks to make all NEWBUILD=false round 4 Reviewed-by: jjh Contributed-by: james.laskey@oracle.com
nashorn/makefiles/BuildNashorn.gmk
--- a/nashorn/makefiles/BuildNashorn.gmk	Fri Feb 22 12:22:16 2013 +0100
+++ b/nashorn/makefiles/BuildNashorn.gmk	Fri Feb 22 10:39:00 2013 -0400
@@ -78,8 +78,8 @@
 	$(MKDIR) -p $(@D)
 	$(RM) -rf $(@D)/jdk $(@D)/netscape
 	$(CP) -R -p $(NASHORN_OUTPUTDIR)/nashorn_classes/* $(@D)/
-	$(JDK_OUTPUTDIR)/bin/java \
-		-cp $(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes \
+	$(FIXPATH) $(JDK_OUTPUTDIR)/bin/java \
+		-cp "$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
 		jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
 	for f in `$(FIND) $(@D)/jdk/nashorn/internal/objects/ -name "*.class"`; do \
 	  mv "$$f" `$(ECHO) "$$f" | $(SED) "s/\.class$$/\.clazz/"`; \