summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-07 02:48:04 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-07 02:48:04 +0000
commitdda0d61e684ac1662416f7fc721b452e370f9add (patch)
tree2a2e8471dd63031e9995fb345e0cb0a68ec1604e
parentef6734aa9b393c3d1aaaf733691c6b3fce4ddbc1 (diff)
* common.mk (rdoc): add --encoding=UTF-8; ruby's rdoc must be UTF-8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--common.mk2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 05bb6d55b2..8d839b0853 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 7 11:46:59 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * common.mk (rdoc): add --encoding=UTF-8; ruby's rdoc must be UTF-8.
+
Mon Feb 7 10:21:50 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* test/rdoc/test_rdoc_options.rb (TestRDocOptions#test_check_files):
diff --git a/common.mk b/common.mk
index 3987805fc2..7544f96f7e 100644
--- a/common.mk
+++ b/common.mk
@@ -387,7 +387,7 @@ post-install-doc::
rdoc: PHONY main
@echo Generating RDoc documentation
- $(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --no-force-update --all --ri --op "$(RDOCOUT)" $(RDOCFLAGS) "$(srcdir)"
+ $(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" $(RDOCFLAGS) "$(srcdir)"
nodoc: PHONY
what-where-doc: no-install-doc