diff options
author | nagachika <nagachika@ruby-lang.org> | 2022-10-15 16:25:26 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2022-10-15 16:25:26 +0900 |
commit | f2c28e90698d6d9e8321237d3510d1737fc166ca (patch) | |
tree | 4983ced5a337aca785ecafff0b8a852bb4770e76 /common.mk | |
parent | ef7cf5304eeb1835d4bf50f0001f7fd889b630a7 (diff) |
merge revision(s) bb0a22a8c05994396aa316c242ff8816d8d0a259:
Obey spec file locations to rubygems
---
common.mk | 3 ++-
defs/gmake.mk | 2 +-
tool/gem-unpack.rb | 5 +++--
3 files changed, 6 insertions(+), 4 deletions(-)
Diffstat (limited to 'common.mk')
-rw-r--r-- | common.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1361,10 +1361,11 @@ extract-gems$(gnumake:yes=-nongnumake): PHONY $(Q) $(RUNRUBY) -C "$(srcdir)" \ -Itool -rgem-unpack -answ \ -e 'BEGIN {FileUtils.mkdir_p(d = ".bundle/gems")}' \ + -e 'BEGIN {FileUtils.mkdir_p(s = ".bundle/specifications")}' \ -e 'gem, ver = *$$F' \ -e 'next if !ver or /^#/=~gem' \ -e 'g = "#{gem}-#{ver}"' \ - -e 'File.directory?("#{d}/#{g}") or Gem.unpack("gems/#{g}.gem", d)' \ + -e 'File.directory?("#{d}/#{g}") or Gem.unpack("gems/#{g}.gem", d, s)' \ gems/bundled_gems update-bundled_gems: PHONY |