OpenJDK / bsd-port / jdk9 / jdk
changeset 5800:334b6f0c547f
Merge
| author | lana |
|---|---|
| date | Thu, 30 Aug 2012 16:51:46 -0700 |
| parents | 47f8ba39265c 70ad0ed1d6ce |
| children | f9b11772c4b2 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Release.gmk Thu Aug 30 14:42:10 2012 -0700 +++ b/make/common/Release.gmk Thu Aug 30 16:51:46 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/makefiles/Images.gmk Thu Aug 30 14:42:10 2012 -0700 +++ b/makefiles/Images.gmk Thu Aug 30 16:51:46 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