diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-30 12:21:55 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-30 12:21:55 +0000 |
commit | ee90d5d30ee3d483e86583d133d19f4cd77da7dd (patch) | |
tree | 0903861145bd930f8bfcf20a31e0d8c0a2574138 | |
parent | 0cf5d3fa963e084e80feac64977ca4c83afcbf22 (diff) | |
download | ruby-ee90d5d30ee3d483e86583d133d19f4cd77da7dd.tar.gz |
* ext/psych/extconf.rb: install psych .so to not psych/ but direct.
This prepends to install *.rb files to psych/psych.
* ext/psych/lib/psych.rb: require 'psych.so'.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27115 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ext/psych/extconf.rb | 2 | ||||
-rw-r--r-- | ext/psych/lib/psych.rb | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Tue Mar 30 21:18:32 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/psych/extconf.rb: install psych .so to not psych/ but direct. + This prepends to install *.rb files to psych/psych. + + * ext/psych/lib/psych.rb: require 'psych.so'. + Tue Mar 30 20:55:14 2010 Tanaka Akira <akr@fsij.org> * time.c (w2v): renamed from w2xv. diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb index d789b35e5c..11f44ac104 100644 --- a/ext/psych/extconf.rb +++ b/ext/psych/extconf.rb @@ -11,6 +11,6 @@ end asplode('yaml.h') unless find_header 'yaml.h' asplode('libyaml') unless find_library 'yaml', 'yaml_get_version' -create_makefile 'psych/psych' +create_makefile 'psych' # :startdoc: diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb index c14259373a..59307e3d99 100644 --- a/ext/psych/lib/psych.rb +++ b/ext/psych/lib/psych.rb @@ -1,4 +1,4 @@ -require 'psych/psych' +require 'psych.so' require 'psych/nodes' require 'psych/visitors' require 'psych/handler' |