aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-02-10 11:59:26 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-02-10 11:59:26 +0000
commit986bfd904c239e9aaacde2cb41d892841ccbe0fb (patch)
tree61fe6b0b99a0ff79dbebeefd68fa14da3eaee46d
parentdc502aea7e1fb937fef652b4b480c3a416b70365 (diff)
downloadruby-986bfd904c239e9aaacde2cb41d892841ccbe0fb.tar.gz
* ext/extmk.rb (parse_args): add '-n' to $mflags BEFORE "--".
do not add DESTDIR if already included in $fmlags. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/extmk.rb5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ef4a0240d..b0ef2b2766 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 10 20:55:15 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/extmk.rb (parse_args): add '-n' to $mflags BEFORE "--".
+ do not add DESTDIR if already included in $fmlags.
+
Mon Feb 10 19:54:30 2003 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (FileUtils#uptodate?): use mtime for
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 89d8f088a3..06a9fd50fc 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -141,12 +141,11 @@ def parse_args()
if $mflags.set?(?n)
$dryrun = true
else
- $mflags << '-n' if $dryrun
+ $mflags.unshift '-n' if $dryrun
end
- $mflags << "DESTDIR=#{$destdir}"
-
$continue = $mflags.set?(?k)
+ $mflags |= ["DESTDIR=#{$destdir}"]
end
parse_args()