From 1a1c0aeb50d3faa919db178e7d237dd5388e6710 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 5 Dec 2013 13:18:07 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ lib/mkmf.rb | 1 + 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index b5cc46169e..e2e057a75e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Dec 5 22:18:01 2013 Nobuyoshi Nakada + + * 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 * 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|