diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-28 03:09:29 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-28 03:09:29 +0000 |
commit | da8830e3de84717ca5dbb659b60dc94557f7258c (patch) | |
tree | bb54ec20d43585c49c2eb6f034ecb4073c8cd6c8 | |
parent | 842272540886ff1da58e690907b08f2811a86607 (diff) | |
download | ruby-da8830e3de84717ca5dbb659b60dc94557f7258c.tar.gz |
fix r66599 to sucess install. please refix this patch @nobu
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | configure.ac | 2 | ||||
-rwxr-xr-x | tool/mkconfig.rb | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 6a560f72a3..75603f1959 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,8 @@ AC_SUBST(MAJOR) AC_SUBST(MINOR) AC_SUBST(TEENY) AC_SUBST(RUBY_API_VERSION, '$(MAJOR).$(MINOR)') +AC_SUBST(RUBY_PROGRAM_VERSION, '$(MAJOR).$(MINOR).$(TEENY)') + dnl checks for alternative programs AC_CANONICAL_BUILD RUBY_RM_RECURSIVE diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index fdb284b1a9..74736540cd 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -132,10 +132,10 @@ File.foreach "config.status" do |line| else v_others << v end - case name - when "RUBY_PROGRAM_VERSION" - version = val[/\A"(.*)"\z/, 1] - end + #case name + #when "RUBY_PROGRAM_VERSION" + # version = val[/\A"(.*)"\z/, 1] + #end end # break if /^CEOF/ end @@ -163,6 +163,7 @@ end prefix = vars.expand(vars["prefix"] ||= "") rubyarchdir = vars.expand(vars["rubyarchdir"] ||= "") relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir + puts %[\ # encoding: ascii-8bit # frozen-string-literal: false |