diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-12-31 12:31:12 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-12-31 12:31:12 +0000 |
| commit | 86c90aea3612e901d24232b8ec476339175a6fb9 (patch) | |
| tree | e1388d01a97beed60bab45c431930da542ed5a85 /lib | |
| parent | b8ad2fa064c41e679142d8620381cc966b83dfdf (diff) | |
* Makefile.in, {win32,bcc32}/Makefile.sub: add new target:
what-where, no-install.
* mkconfig.rb: add const: CROSS_COMPILING.
* ext/extmk.rb: no-install support. add MAKEDIRS macro.
* lib/mkmf.rb: add !ifdef .. !endif for Borland make.
* process.c: improve DJGPP support. system "ls", "-l".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3259 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 3ac84ff56b..0be7b73279 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -585,6 +585,16 @@ INSTALL_DATA = $(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true) #### End of system configuration section. #### } + if $nmake == ?b + mk.each do |x| + x.gsub!(/^(MAKEDIRS|INSTALL_(?:PROG|DATA))+\s*=.*\n/) do + "!ifndef " + $1 + "\n" + + $& + + "!endif\n" + end + end + end + mk end def dummy_makefile(srcdir) @@ -792,7 +802,7 @@ def init_mkmf(config = CONFIG) $objs = nil $libs = "" if $enable_shared or Config.expand(config["LIBRUBY"].dup) != Config.expand(config["LIBRUBY_A"].dup) - $LIBPATH.unshift("$(libdir)") unless $extmk or defined? CROSS_COMPILING + $LIBPATH.unshift("$(libdir)") unless $extmk or CROSS_COMPILING $LIBRUBYARG = config['LIBRUBYARG'] end |