From e3abdccca020496b047769e506db8da7342ea15f Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 16 Oct 2022 16:29:02 +0900 Subject: merge revision(s) db3d111c1d1e90b400f1e737ded6a4e4bdf2cec8: Bundled gems are expanded under `.bundle/gems` now --- ext/extmk.rb | 13 +++++++------ template/exts.mk.tmpl | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) --- template/exts.mk.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'template') diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl index 924abeb2fb..909689514a 100644 --- a/template/exts.mk.tmpl +++ b/template/exts.mk.tmpl @@ -25,7 +25,7 @@ macros["old_extensions"] = [] contpat = /(?>(?>[^\\\n]|\\.)*\\\n)*(?>[^\\\n]|\\.)*/ Dir.glob("{ext,.bundle/gems}/*/exts.mk") do |e| - gem = /\Agems(?=\/)/ =~ e + gem = e.start_with?(".bundle/gems/") s = File.read(e) s.scan(/^(extensions|SUBMAKEOPTS|EXT[A-Z]+|MFLAGS|NOTE_[A-Z]+)[ \t]*=[ \t]*(#{contpat})$/o) do |n, v| v.gsub!(/\\\n[ \t]*/, ' ') -- cgit v1.2.3