summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb12
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