From 385c5ffacc7521a81dbe102c07048e6ebd66b1b0 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 22 Jan 2008 10:40:23 +0000 Subject: * lib/mkmf.rb (create_makefile): lib files shoudn't depend on install dir because if the dir is newer than lib files, lib files will be always copied. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15170 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/mkmf.rb | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c997bff0e5..dae8d49fbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jan 22 19:37:16 2008 NAKAMURA Usaku + + * lib/mkmf.rb (create_makefile): lib files shoudn't depend on install + dir because if the dir is newer than lib files, lib files will be + always copied. + Tue Jan 22 17:52:52 2008 Martin Duerst * enc/trans/utf_16_32.c: Streamline parentheses, add more diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d99209e2d6..60859eeb88 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1519,11 +1519,13 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} unless dirs.include?(dir) dirs << dir mfile.print "pre-install-rb#{sfx}: #{dir}\n" - end + end if $nmake for f in files dest = "#{dir}/#{File.basename(f)}" mfile.print("install-rb#{sfx}: #{dest}\n") - mfile.print("#{dest}: #{f} #{dir}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ") + mfile.print("#{dest}: #{f}\n") + mfile.print("\t$(MAKEDIRS) $(@D)\n") unless $nmake + mfile.print("\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ") sep = config_string('BUILD_FILE_SEPARATOR') if sep f = f.gsub("/", sep) @@ -1541,7 +1543,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} end end dirs.unshift(sodir) if target and !dirs.include?(sodir) - dirs.each {|d| mfile.print "#{d}:\n\t$(MAKEDIRS) $@\n"} + dirs.each {|d| mfile.print "#{d}:\n\t$(MAKEDIRS) $@\n"} if $nmake mfile.print <<-SITEINSTALL -- cgit v1.2.3