stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Michael Fang 2011-04-27 23:28:51 -07:00
commit 9984385316
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/make/common/Defs-linux.gmk
View File

@ -355,7 +355,7 @@ HAVE_DPS = no
# Japanese manpages # Japanese manpages
# #
JA_SOURCE_ENCODING = eucJP JA_SOURCE_ENCODING = eucJP
JA_TARGET_ENCODINGS = eucJP JA_TARGET_ENCODINGS = UTF-8
# Settings for the JDI - Serviceability Agent binding. # Settings for the JDI - Serviceability Agent binding.
HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH) HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)

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

@ -164,7 +164,7 @@ endif # solaris
ifeq ($(PLATFORM), linux) ifeq ($(PLATFORM), linux)
MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR) MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR)
MAN1SUBDIR=man MAN1SUBDIR=man
JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING) JA_DIRNAME=ja_JP.UTF-8
endif # linux endif # linux
define copy-man-pages define copy-man-pages
@ -190,8 +190,7 @@ for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
done done
$(java-vm-cleanup) $(java-vm-cleanup)
if [ "$(JA_DIRNAME)" != "" ] ; then \ if [ "$(JA_DIRNAME)" != "" ] ; then \
$(MV) $1/man/ja $1/man/$(JA_DIRNAME); \ $(CD) $1/man && $(RM) ja && $(LN) -s $(JA_DIRNAME) ja; \
$(CD) $1/man && $(LN) -s $(JA_DIRNAME) ja; \
fi fi
endef endef