ruby-changes:54386
From: ko1 <ko1@a...>
Date: Fri, 28 Dec 2018 12:09:34 +0900 (JST)
Subject: [ruby-changes:54386] ko1:r66600 (trunk): fix r66599 to sucess install. please refix this patch @nobu
ko1 2018-12-28 12:09:29 +0900 (Fri, 28 Dec 2018) New Revision: 66600 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66600 Log: fix r66599 to sucess install. please refix this patch @nobu Modified files: trunk/configure.ac trunk/tool/mkconfig.rb Index: tool/mkconfig.rb =================================================================== --- tool/mkconfig.rb (revision 66599) +++ tool/mkconfig.rb (revision 66600) @@ -132,10 +132,10 @@ File.foreach "config.status" do |line| https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L132 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 https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L163 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 Index: configure.ac =================================================================== --- configure.ac (revision 66599) +++ configure.ac (revision 66600) @@ -67,6 +67,8 @@ AC_SUBST(MAJOR) https://github.com/ruby/ruby/blob/trunk/configure.ac#L67 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/