From fb0b931709d92ccfe3ac1bfe2f883cf36eda9e20 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 30 Dec 2002 10:16:53 +0000 Subject: * ext/extmk.rb: split --make argument contains options, assume the first word of --make-flags is always options even unless preceeded by -, and ignore letter-case of options if nmake. * instruby.rb: extract -n option also from --make and --make-flags. * bcc32/Makefile.sub, win32/Makefile.sub: not prepend - to $(MFLAGS) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- instruby.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'instruby.rb') diff --git a/instruby.rb b/instruby.rb index 4e82a35b91..c07a3ff56d 100644 --- a/instruby.rb +++ b/instruby.rb @@ -12,9 +12,13 @@ File.umask(0) getopts("n", "make:", "make-flags:") $dryrun = $OPT["n"] -Shellwords.shellwords($OPT["make-flags"] || "").grep(/^-[^-]*n/) do - break $dryrun = true -end +mflags = Shellwords.shellwords($OPT["make-flags"] || "") +mflags[0].sub!(/^(?=\w+)$/, "-") unless mflags.empty? +make, *mflags[0, 0] = Shellwords.shellwords($OPT['make'] || ENV["MAKE"] || "") +mflags = mflags.grep(/^-[^-]*/) {$1}.join +mflags.downcase! if /nmake/i == make +$dryrun = true if mflags.include?(?n) + ARGV.delete_if{|x|x[0] == ?-} destdir = ARGV[0] || '' -- cgit v1.2.3