Merge
authorkatleman
Wed, 16 May 2012 22:07:29 -0700
changeset 12606 2052d5a6991c
parent 12603 926e0735f658 (current diff)
parent 12605 1cd85c736535 (diff)
child 12607 682e79207ecb
Merge
--- a/jdk/make/common/Release.gmk	Thu May 10 10:25:14 2012 -0700
+++ b/jdk/make/common/Release.gmk	Wed May 16 22:07:29 2012 -0700
@@ -156,6 +156,7 @@
         jstack.1           \
         jstat.1            \
         jstatd.1           \
+        jvisualvm.1        \
 	native2ascii.1     \
 	rmic.1             \
         schemagen.1        \
@@ -1311,8 +1312,8 @@
 	@$(java-vm-cleanup)
 
 # Clean up names in the messages printed out
-CAT_FILTER = $(SED) -e "s@$(JDK_IMAGE_DIR)@JDK_IMAGE@g" \
-	            -e "s@$(JRE_IMAGE_DIR)@JRE_IMAGE@g"
+CAT_FILTER = $(SED) -e "s|$(JDK_IMAGE_DIR)|JDK_IMAGE|g" \
+	            -e "s|$(JRE_IMAGE_DIR)|JRE_IMAGE|g"
 
 # Report on the jre image comparison
 compare-image-jre: $(TEMP_PREV_JRE_COMPARISON)