Merge

0070da84 · katleman · efe18d26 · 578777d2 · 0070da84 · 0070da84
隐藏空白更改
内联并排

Showing with 8 addition and 2 deletion

make/common/Release.gmk make/common/Release.gmk +4 -1

makefiles/Images.gmk makefiles/Images.gmk +4 -1

未找到文件。
--- a/make/common/Release.gmk
+++ b/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

--- a/makefiles/Images.gmk
+++ b/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