summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-30 02:33:59 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-30 02:33:59 +0000
commitd78e20912fd47e600e6c6bf2fcdb6e2e6593f298 (patch)
treecdd1cae5d5acf44f711163f9c1ad9308a5e6c028 /win32
parentaf859f8d549e1aea04141e36aaf7070fd66dcc9a (diff)
* win32/Makefile.sub (ruby_pc): ignore missing variables.
* template/ruby.pc.in: add missing variables for mswin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub5
1 files changed, 3 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 6d654d90e7..d32e0c7b1a 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -899,9 +899,10 @@ end
<<KEEP
$(ruby_pc): $(RBCONFIG)
- @$(MINIRUBY) -rrbconfig -p \
+ @$(MINIRUBY) -r./rbconfig -p \
+ -e 'STDOUT.binmode' \
-e '$$_.gsub!(/@([a-z_]\w*)@/i) {' \
- -e 'RbConfig::MAKEFILE_CONFIG[$$1].gsub(/\$$\((.+?)\)/, %Q[$${\1}])'
+ -e '(RbConfig::MAKEFILE_CONFIG[$$1] or "").gsub(/\$$\((.+?)\)/, %Q[$${\\1}])' \
-e '}' \
$(srcdir)/template/ruby.pc.in > $@