diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-23 15:33:01 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-23 15:33:01 +0000 |
| commit | b9bfc5b8aa895a1c7bf456fde79b71f5f49edb3e (patch) | |
| tree | 4fc060fd72d13c94df8e4f57c625d9dd9667905a /lib | |
| parent | aadf98f11f6d8c429f91c5ddebdc4dfadeed9395 (diff) | |
merge revision(s) 44019: [Backport #9213]
* 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/branches/ruby_2_0_0@44367 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 7653cc6a43..d7dc1b1a9b 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1811,6 +1811,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} prefix = mkintpath(CONFIG["prefix"]) if destdir = prefix[$dest_prefix_pattern, 1] mk << "\nDESTDIR = #{destdir}\n" + prefix = prefix[destdir.size..-1] end mk << "prefix = #{with_destdir(prefix).unspace}\n" CONFIG.each do |key, var| |