diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | enc/encinit.c.erb | 15 |
2 files changed, 10 insertions, 9 deletions
@@ -1,4 +1,6 @@ -Thu May 17 10:37:07 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu May 17 10:39:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * enc/encinit.c.erb: use %-lines to adjust indent in the generated file. * lib/mkmf.rb (MakeMakefile#have_framework): combine -framework option and its argument with an equal sign not to be separated in merge_libs. diff --git a/enc/encinit.c.erb b/enc/encinit.c.erb index 17b94027d0..9926330aac 100644 --- a/enc/encinit.c.erb +++ b/enc/encinit.c.erb @@ -1,4 +1,3 @@ -<%# -*- encoding: UTF-8 -*-%> /* Copyright 2012 Google Inc. Some Rights Reserved. * Author: yugui@google.com (Yugui Sonoda) */ @@ -13,14 +12,14 @@ void ruby_init_ext(const char *name, void (*init)(void)); void Init_enc() { - <% ENCS.each do |enc| -%> +% ENCS.each do |enc| init(Init_<%= enc %>, "enc/<%= enc %>.so"); - <% end -%> +% end - init(Init_transdb, "enc/trans/transdb.so"); - <% TRANS.each do |trans| -%> - <% next if trans == 'trans/transdb' -%> + init(Init_transdb, "enc/trans/transdb.so"); +% TRANS.each do |trans| +% next if trans == 'trans/transdb' init(Init_trans_<%= File.basename trans %>, "enc/<%= trans %>.so"); - <% end -%> +% end } -<%# vim: set fenc=utf-8 ft=eruby sw=2 : -%> +<%# vim: set ft=eruby sw=2 : -%> |