diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-10 03:07:24 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-10 03:07:24 +0000 |
| commit | 80f43309730056cffbf29fd4e11a24643900f55e (patch) | |
| tree | e1f8e1da66c55147b3b1427edf64348c58aaef2d /lib | |
| parent | 6400a671b8775096f3c312cf04e413c3307b2edb (diff) | |
| download | ruby-80f43309730056cffbf29fd4e11a24643900f55e.tar.gz | |
* bcc32/Makefile.sub (COMMON_LIBS): add libraries included in
import32.lib.
* lib/mkmf.rb (create_makefile): restrict prefixing with srcdir to
rule lines, add search path to implicit rules, and set Borland make
special macros for search path.
* win32/win32.c, win32/win32.h (read): aboid a BCC runtime bug.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index c5cfad30bb..b2ae7e501b 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1033,6 +1033,7 @@ site-install-rb: install-rb return unless target + mfile.puts SRC_EXT.collect {|ext| ".path.#{ext} = $(VPATH)"} if $nmake == ?b mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n" mfile.print "\n" @@ -1068,13 +1069,22 @@ site-install-rb: install-rb end depend = File.join(srcdir, "depend") + cont = rule = false if File.exist?(depend) open(depend, "r") do |dfile| mfile.printf "###\n" while line = dfile.gets() line.gsub!(/\.o\b/, ".#{$OBJEXT}") - line.gsub!(/(\s)([^\s\/]+\.[ch])/, '\1{$(srcdir)}\2') if $nmake line.gsub!(/\$\(hdrdir\)\/config.h/, $config_h) if $config_h + if $nmake + rule = /^[$\w][^#]*:/ =~ line unless cont + cont = /(?:^|[^\\])(?:\\\\)*\\$/ =~ line + if rule + line.gsub!(%r"(?<=\s)(?!\.)(?=[^\s\/]+\.(?:#{(SRC_EXT + ['h']).join('|')})(?\s|\z))"o, '{.;$(VPATH)}') + else + line.sub!(/^(\.\w+)(\.\w+)(?=\s*:)/, '{.;$(VPATH)}\1{}\2') + end + end mfile.print line end end |