changeset 13498:9b806d4f69be

Merge
author katleman
date Wed, 29 Aug 2012 15:28:39 -0700
parents fb8ac3144743 2c09fb7cdf7f
children 8352c8893fd3
files
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/make/common/Release.gmk	Thu Aug 23 12:27:49 2012 -0700
+++ b/jdk/make/common/Release.gmk	Wed Aug 29 15:28:39 2012 -0700
@@ -156,7 +156,6 @@
         jstack.1           \
         jstat.1            \
         jstatd.1           \
-        jvisualvm.1        \
 	native2ascii.1     \
 	rmic.1             \
         schemagen.1        \
@@ -165,6 +164,10 @@
         wsimport.1         \
         xjc.1
 
+ifndef OPENJDK
+  JDK_MAN_PAGES += jvisualvm.1
+endif
+
 ifeq ($(PLATFORM), solaris)
   MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR)
   MAN1SUBDIR=sun/man/man1
--- a/jdk/makefiles/Images.gmk	Thu Aug 23 12:27:49 2012 -0700
+++ b/jdk/makefiles/Images.gmk	Wed Aug 29 15:28:39 2012 -0700
@@ -237,7 +237,6 @@
         jstack.1           \
         jstat.1            \
         jstatd.1           \
-	jvisualvm.1        \
 	native2ascii.1     \
 	rmic.1             \
         schemagen.1        \
@@ -246,6 +245,10 @@
         wsimport.1         \
         xjc.1
 
+ifndef OPENJDK
+  JDK_MAN_PAGES += jvisualvm.1
+endif
+
 ifeq ($(OPENJDK_TARGET_OS), linux)
     MAN_SRC_DIR:=$(JDK_TOPDIR)/src/linux/doc
     MAN1_SUBDIR:=man