diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-10 06:09:40 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-10 06:09:40 +0000 |
| commit | 6b95829d71c0a3bb88b3263c6a7a8ef2ba059567 (patch) | |
| tree | 096bba901b789d9c514b92940492cdd53769cbb7 | |
| parent | c389b3bb637a32a12d2445bfcd958d1b3c033c19 (diff) | |
| download | ruby-6b95829d71c0a3bb88b3263c6a7a8ef2ba059567.tar.gz | |
* ext/extmk.rb: prepend also topdir to mflags at last.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/extmk.rb | 3 |
2 files changed, 4 insertions, 3 deletions
@@ -1,8 +1,8 @@ -Sun Jun 10 14:48:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jun 10 15:11:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * Makefile.in, win32/Makefile.sub (XCFLAGS): -I. is needed for *.inc. - * ext/extmk.rb (parse_args): add also topdir to mflags. + * ext/extmk.rb: prepend also topdir to mflags at last. Sun Jun 10 13:47:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> diff --git a/ext/extmk.rb b/ext/extmk.rb index 17b918d1be..e4b62c8553 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -289,7 +289,7 @@ def parse_args() $extout = '$(topdir)/'+$extout RbConfig::CONFIG["extout"] = CONFIG["extout"] = $extout $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : "" - $mflags << "topdir=#$topdir" << "extout=#$extout" << "extout_prefix=#$extout_prefix" + $mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix" end end @@ -523,6 +523,7 @@ if $nmake == ?b vars.each {|flag| flag.sub!(/\A/, "-D")} end end +$mflags.unshift("topdir=#$topdir") system($make, *sysquote($mflags)) or exit($?.exitstatus) #Local variables: |