archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 04:24:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
David Katleman 2012-08-29 15:28:39 -07:00
commit c4c4e329f2
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
jdk/make/common/Release.gmk
View file

@ -156,7 +156,6 @@ JDK_MAN_PAGES = \
jstack.1 \ jstack.1 \
jstat.1 \ jstat.1 \
jstatd.1 \ jstatd.1 \
jvisualvm.1 \
native2ascii.1 \ native2ascii.1 \
rmic.1 \ rmic.1 \
schemagen.1 \ schemagen.1 \
@ -165,6 +164,10 @@ JDK_MAN_PAGES = \
wsimport.1 \ wsimport.1 \
xjc.1 xjc.1
ifndef OPENJDK
JDK_MAN_PAGES += jvisualvm.1
endif
ifeq ($(PLATFORM), solaris) ifeq ($(PLATFORM), solaris)
MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR) MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR)
MAN1SUBDIR=sun/man/man1 MAN1SUBDIR=sun/man/man1

5
jdk/makefiles/Images.gmk
View file

@ -237,7 +237,6 @@ JDK_MAN_PAGES = \
jstack.1 \ jstack.1 \
jstat.1 \ jstat.1 \
jstatd.1 \ jstatd.1 \
jvisualvm.1 \
native2ascii.1 \ native2ascii.1 \
rmic.1 \ rmic.1 \
schemagen.1 \ schemagen.1 \
@ -246,6 +245,10 @@ JDK_MAN_PAGES = \
wsimport.1 \ wsimport.1 \
xjc.1 xjc.1
ifndef OPENJDK
JDK_MAN_PAGES += jvisualvm.1
endif
ifeq ($(OPENJDK_TARGET_OS), linux) ifeq ($(OPENJDK_TARGET_OS), linux)
MAN_SRC_DIR:=$(JDK_TOPDIR)/src/linux/doc MAN_SRC_DIR:=$(JDK_TOPDIR)/src/linux/doc
MAN1_SUBDIR:=man MAN1_SUBDIR:=man