summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xext/extmk.rb3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f7992c157..fc4f1cea22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 31 00:52:23 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb: make the gems target directory under the expanded
+ name. [ruby-core:77102] [Bug #12714]
+
Tue Aug 30 15:27:27 2016 Kouhei Yanagita <yanagi@shakenbu.org>
* ext/json/lib/json/add/ostruct.rb (OpenStruct.json_create):
diff --git a/ext/extmk.rb b/ext/extmk.rb
index f75d2eaad8..d5592e114c 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -535,7 +535,7 @@ end
if $extout
extout = RbConfig.expand("#{$extout}", RbConfig::CONFIG.merge("topdir"=>$topdir))
unless $ignore
- FileUtils.mkpath(extout)
+ FileUtils.mkpath("#{extout}/gems")
end
end
@@ -565,7 +565,6 @@ end
Dir.chdir('..')
FileUtils::makedirs('gems')
-FileUtils::makedirs("#$extout/gems")
Dir.chdir('gems')
extout = $extout
gems.each do |d|