From 7e51cd125da6d2362497722247d3fe7fc24a3117 Mon Sep 17 00:00:00 2001
From: Andrew John Hughes <andrew@openjdk.org>
Date: Thu, 23 Aug 2012 15:42:23 +0100
Subject: [PATCH] 7192804: Build should not install jvisualvm man page for
 OpenJDK

OpenJDK builds don't ship VisualVM so shouldn't ship its man page either.

Reviewed-by: dholmes
---
 jdk/make/common/Release.gmk | 5 ++++-
 jdk/makefiles/Images.gmk    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk
index 2d45f5e0834..4c08ecda662 100644
--- a/jdk/make/common/Release.gmk
+++ b/jdk/make/common/Release.gmk
@@ -156,7 +156,6 @@ JDK_MAN_PAGES =            \
         jstack.1           \
         jstat.1            \
         jstatd.1           \
-        jvisualvm.1        \
 	native2ascii.1     \
 	rmic.1             \
         schemagen.1        \
@@ -165,6 +164,10 @@ JDK_MAN_PAGES =            \
         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
diff --git a/jdk/makefiles/Images.gmk b/jdk/makefiles/Images.gmk
index bda32366082..58474831f69 100644
--- a/jdk/makefiles/Images.gmk
+++ b/jdk/makefiles/Images.gmk
@@ -237,7 +237,6 @@ JDK_MAN_PAGES =            \
         jstack.1           \
         jstat.1            \
         jstatd.1           \
-	jvisualvm.1        \
 	native2ascii.1     \
 	rmic.1             \
         schemagen.1        \
@@ -246,6 +245,10 @@ JDK_MAN_PAGES =            \
         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