kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

mkmf.rb: strip destdir from prefix

Browse source 
* lib/mkmf.rb (configuration): strip destdir part from prefix to get
  rid of duplication.  a patch by arton at [ruby-core:58859].
  [ruby-core:58856] [Bug #9213]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44019 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-12-05 13:18:07 +00:00
parent efbcd1cb25
commit 1a1c0aeb50
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Dec 5 22:18:01 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (configuration): strip destdir part from prefix to get
rid of duplication. a patch by arton at [ruby-core:58859].
[ruby-core:58856] [Bug #9213]
Thu Dec 5 21:53:29 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Dec 5 21:53:29 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_or): lhs elements are prefered, so should not * array.c (rb_ary_or): lhs elements are prefered, so should not

1
lib/mkmf.rb
View file

@ -1849,6 +1849,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
prefix = mkintpath(CONFIG["prefix"]) prefix = mkintpath(CONFIG["prefix"])
if destdir = prefix[$dest_prefix_pattern, 1] if destdir = prefix[$dest_prefix_pattern, 1]
mk << "\nDESTDIR = #{destdir}\n" mk << "\nDESTDIR = #{destdir}\n"
prefix = prefix[destdir.size..-1]
end end
mk << "prefix = #{with_destdir(prefix).unspace}\n" mk << "prefix = #{with_destdir(prefix).unspace}\n"
CONFIG.each do |key, var| CONFIG.each do |key, var|