Skip to content

Commit da8830e

Browse files
committed
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
1 parent 8422725 commit da8830e

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

configure.ac

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ AC_SUBST(MAJOR)
6767
AC_SUBST(MINOR)
6868
AC_SUBST(TEENY)
6969
AC_SUBST(RUBY_API_VERSION, '$(MAJOR).$(MINOR)')
70+
AC_SUBST(RUBY_PROGRAM_VERSION, '$(MAJOR).$(MINOR).$(TEENY)')
71+
7072
dnl checks for alternative programs
7173
AC_CANONICAL_BUILD
7274
RUBY_RM_RECURSIVE

tool/mkconfig.rb

+5-4
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@
132132
else
133133
v_others << v
134134
end
135-
case name
136-
when "RUBY_PROGRAM_VERSION"
137-
version = val[/\A"(.*)"\z/, 1]
138-
end
135+
#case name
136+
#when "RUBY_PROGRAM_VERSION"
137+
# version = val[/\A"(.*)"\z/, 1]
138+
#end
139139
end
140140
# break if /^CEOF/
141141
end
@@ -163,6 +163,7 @@ def vars.expand(val, config = self)
163163
prefix = vars.expand(vars["prefix"] ||= "")
164164
rubyarchdir = vars.expand(vars["rubyarchdir"] ||= "")
165165
relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir
166+
166167
puts %[\
167168
# encoding: ascii-8bit
168169
# frozen-string-literal: false

0 commit comments

Comments
 (0)