summaryrefslogtreecommitdiff
path: root/instruby.rb
diff options
context:
space:
mode:
Diffstat (limited to 'instruby.rb')
-rw-r--r--instruby.rb10
1 files changed, 7 insertions, 3 deletions
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] || ''