From ccfb459b7d30b13e8f37a07ae82eae4161bb83d4 Mon Sep 17 00:00:00 2001 From: H_Konishi Date: Sun, 27 Oct 2002 14:05:25 +0000 Subject: [PATCH] ext/extmk.rb(78) : The unnecessary error when installing by bccwin32 is controlled. lib/mkmf.rb(773) : Also in the case of bccwin32, the path was added. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ ext/extmk.rb | 3 +++ lib/mkmf.rb | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0417b6524c..ac3f3e53be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Oct 27 22:59:50 2002 KONISHI Hiromasa + + * ext/extmk.rb(78) : The unnecessary error when installing by bccwin32 + is controlled. + + * lib/mkmf.rb(773) : Also in the case of bccwin32, the path was added. + Sat Oct 26 10:11:47 2002 Akinori MUSHA * node.h (nd_type): cast the value to int. diff --git a/ext/extmk.rb b/ext/extmk.rb index b9b943c0ec..bfd39f9206 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -75,6 +75,9 @@ def extmake(target) else open("./Makefile", "w") {|f| f.print configuration($srcdir), makerules(nil), "install:\n" + if /bccwin32/ =~ RUBY_PLATFORM + f.print "\t@\n" + end } end if $static diff --git a/lib/mkmf.rb b/lib/mkmf.rb index e19fdb35fd..ba7d6cd8fd 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -770,7 +770,7 @@ DISTCLEANFILES = #{distcleanfiles.join(' ')} mfile.printf "###\n" while line = dfile.gets() line.gsub!(/\.o\b/, ".#{$OBJEXT}") - line.gsub!(/(\s)([^\s\/]+\.[ch])/, '\1{$(srcdir)}\2') if $nmake + line.gsub!(/(\s)([^\s\/]+\.[ch])/, '\1{$(srcdir)}\2') if $nmake||$bccwin line.gsub!(/\$\(hdrdir\)\/config.h/, $config_h) if $config_h mfile.print line end