Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7036955: Japanese man pages in linux should be in utf-8 encoding
authorogino
Tue, 26 Apr 2011 21:46:20 -0700
changeset 9367 7ed49dc79ebc
parent 9357 714a5a1cd415
child 9370 43e8fa2f6452
7036955: Japanese man pages in linux should be in utf-8 encoding Reviewed-by: ohair, mfang
jdk/make/common/Defs-linux.gmk file | annotate | diff | comparison | revisions
jdk/make/common/Release.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/common/Defs-linux.gmk	Mon Apr 25 16:39:49 2011 -0700
+++ b/jdk/make/common/Defs-linux.gmk	Tue Apr 26 21:46:20 2011 -0700
@@ -355,7 +355,7 @@
 # Japanese manpages
 #
 JA_SOURCE_ENCODING = eucJP
-JA_TARGET_ENCODINGS = eucJP
+JA_TARGET_ENCODINGS = UTF-8
 
 # Settings for the JDI - Serviceability Agent binding.
 HOTSPOT_SALIB_PATH   = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)
--- a/jdk/make/common/Release.gmk	Mon Apr 25 16:39:49 2011 -0700
+++ b/jdk/make/common/Release.gmk	Tue Apr 26 21:46:20 2011 -0700
@@ -164,7 +164,7 @@
 ifeq ($(PLATFORM), linux)
   MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR)
   MAN1SUBDIR=man
-  JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING)
+  JA_DIRNAME=ja_JP.UTF-8
 endif # linux
 
 define copy-man-pages
@@ -190,8 +190,7 @@
 done
 $(java-vm-cleanup)
 if [ "$(JA_DIRNAME)" != "" ] ; then \
-  $(MV) $1/man/ja $1/man/$(JA_DIRNAME); \
-  $(CD) $1/man && $(LN) -s $(JA_DIRNAME) ja; \
+  $(CD) $1/man && $(RM) ja && $(LN) -s $(JA_DIRNAME) ja; \
 fi
 endef
jdk-sandbox