diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-14 04:31:11 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-14 04:31:11 +0000 |
| commit | 32f518dcd80b73ef17a3c59a6054edd81fc8e74b (patch) | |
| tree | 9b75e3010b43c9a9b8edd0111fef955742981839 | |
| parent | 0ff4feb6a532ba7b485c2fbc1643c18c8b35af3d (diff) | |
* ext/iconv/extconf.rb: wrapper iconv.rb is dependent on platform.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ext/iconv/extconf.rb | 4 |
2 files changed, 9 insertions, 5 deletions
@@ -1,15 +1,19 @@ +Wed Jan 14 13:31:06 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/iconv/extconf.rb: wrapper iconv.rb is dependent on platform. + Tue Jan 13 18:54:28 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp> * lib/logger.rb(Logger#msg2str): no special treatment for the object - which responds to :to_str. commited at 2004-01-11T21:46:27 by + which responds to :to_str. commited at 2004-01-11T21:46:27 by gsinclair. * lib/logger.rb(LogDevice#initialize): remove type checking if the - given object is a String. Kernel.open handles it correctly. + given object is a String. Kernel.open handles it correctly. commited at 2004-01-11T21:46:27 by gsinclair. * test/logger/test_logger.rb: follow above change (ArgumentError -> - TypeError.) follow above commit. + TypeError.) follow above commit. Tue Jan 13 14:27:13 2004 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb index 8dfd562a40..36cd60ed15 100644 --- a/ext/iconv/extconf.rb +++ b/ext/iconv/extconf.rb @@ -24,14 +24,14 @@ test(iconv_t cd, char **inptr, size_t *inlen, char **outptr, size_t *outlen) if conf prefix = '$(srcdir)' prefix = $nmake ? "{#{prefix}}" : "#{prefix}/" - $INSTALLFILES = [["./iconv.rb", "$(RUBYLIBDIR)"]] + wrapper = "./iconv.rb" + $INSTALLFILES = [[wrapper, "$(RUBYARCHDIR)"]] if String === conf require 'uri' scheme = URI.parse(conf).scheme else conf = prefix + "config.charset" end - wrapper = "iconv.rb" $cleanfiles << wrapper end create_makefile("iconv") |