diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-01 09:44:56 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-01 09:44:56 +0000 |
commit | 4f82c3dfe6463f6726e35f26490e7d1ff3df11de (patch) | |
tree | f7aec5e28663c166df06c4eab67003b0c57ed796 | |
parent | 6d757a9d8f2e80ef4dbe57caabd8cda223f9ad99 (diff) | |
download | ruby-4f82c3dfe6463f6726e35f26490e7d1ff3df11de.tar.gz ruby-4f82c3dfe6463f6726e35f26490e7d1ff3df11de.tar.xz ruby-4f82c3dfe6463f6726e35f26490e7d1ff3df11de.zip |
* mkconfig.rb: ignores version numbers in config.status. replaces
all $$s in program_transform_name.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rwxr-xr-x | mkconfig.rb | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Apr 1 18:44:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * mkconfig.rb: ignores version numbers in config.status. replaces + all $$s in program_transform_name. + Wed Apr 1 15:12:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * Makefile.in (.c.i): use CPP instead of CC, since gcc -E can' diff --git a/mkconfig.rb b/mkconfig.rb index 67cc3fd1e..e5d9c806b 100755 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -76,11 +76,12 @@ File.foreach "config.status" do |line| next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name next if $so_name and /^RUBY_SO_NAME$/ =~ name next if /^(?:X|(?:MINI|RUN)RUBY$)/ =~ name + next if /^(?:MAJOR|MINOR|TEENY)$/ =~ name arch = val if name == "arch" if /^program_transform_name$/ =~ name and /^s(\\?.)(.*)\1$/ =~ val next if $install_name sep = %r"#{Regexp.quote($1)}" - ptn = $2.sub(/\$\$/, '$').split(sep, 2) + ptn = $2.gsub(/\$\$/, '$').split(sep, 2) name = "ruby_install_name" val = "ruby".sub(/#{ptn[0]}/, ptn[1]) end |