diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-30 02:33:59 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-30 02:33:59 +0000 |
| commit | d78e20912fd47e600e6c6bf2fcdb6e2e6593f298 (patch) | |
| tree | cdd1cae5d5acf44f711163f9c1ad9308a5e6c028 | |
| parent | af859f8d549e1aea04141e36aaf7070fd66dcc9a (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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | template/ruby.pc.in | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 5 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sat Oct 30 11:33:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/Makefile.sub (ruby_pc): ignore missing variables. + + * template/ruby.pc.in: add missing variables for mswin. + Sat Oct 30 10:24:35 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca> * object.c: Make BasicObject.new accept no parameter. diff --git a/template/ruby.pc.in b/template/ruby.pc.in index 61a29b1966..58beda4fbf 100644 --- a/template/ruby.pc.in +++ b/template/ruby.pc.in @@ -11,6 +11,10 @@ RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@ RUBY_BASE_NAME=@RUBY_BASE_NAME@ RUBY_SO_NAME=@RUBY_SO_NAME@ RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@ +LIBPATH=@LIBPATH@ +LIBRUBY=@LIBRUBY@ +LIBRUBY_A=@LIBRUBY_A@ +LIBRUBY_SO=@LIBRUBY_SO@ LIBRUBYARG_SHARED=@LIBRUBYARG_SHARED@ LIBRUBYARG_STATIC=@LIBRUBYARG_STATIC@ LIBRUBYARG=@LIBRUBYARG@ 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 > $@ |