diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-05 13:18:07 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-05 13:18:07 +0000 |
| commit | 1a1c0aeb50d3faa919db178e7d237dd5388e6710 (patch) | |
| tree | 17a647d2eb3b1eddebc1ad7756d17682ffefea02 | |
| parent | efbcd1cb250f50c5c297bc1468f5cf82004d476d (diff) | |
| download | ruby-1a1c0aeb50d3faa919db178e7d237dd5388e6710.tar.gz | |
mkmf.rb: strip destdir from prefix
* 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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 1 |
2 files changed, 7 insertions, 0 deletions
@@ -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> * array.c (rb_ary_or): lhs elements are prefered, so should not diff --git a/lib/mkmf.rb b/lib/mkmf.rb index a3a39dfe3c..c4e2e5a900 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1849,6 +1849,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| |