summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-14 06:46:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-14 06:46:53 +0000
commit5de227d638a601ec1508873808755a739154c861 (patch)
tree4f78b13248f164c68dca01c0c4733731768f949b
parentbf4020a34e237e7a8ad38dd003ffc4f2bb26acb3 (diff)
make-snapshot: fix VPATH regexp [ci skip]
* tool/make-snapshot (package): replace nmake style VPATH in common.mk by regexp same as one for uncommon.mk, not to replace too much, BEGIN and END in awk and ruby. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-xtool/make-snapshot2
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 12751f63d06..73278a34bcd 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -311,7 +311,7 @@ def package(vcs, rev, destdir, tmp = nil)
}
args = vars.dup
mk.gsub!(/@([A-Za-z_]\w*)@/) {args.delete($1); vars[$1] || ENV[$1]}
- mk << commonmk.gsub(/(?<!#)\{[^{}]*\}/, "")
+ mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "")
mk << <<-'APPEND'
prereq: clean-cache $(CLEAN_CACHE)