[前][次][番号順一覧][スレッド一覧]

ruby-changes:3681

From: ko1@a...
Date: Tue, 22 Jan 2008 19:40:38 +0900 (JST)
Subject: [ruby-changes:3681] usa - Ruby:r15170 (trunk): * lib/mkmf.rb (create_makefile): lib files shoudn't depend on install

usa	2008-01-22 19:40:23 +0900 (Tue, 22 Jan 2008)

  New Revision: 15170

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

  Log:
    * 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.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15170&r2=15169&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=15170&r2=15169&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15169)
+++ ChangeLog	(revision 15170)
@@ -1,3 +1,9 @@
+Tue Jan 22 19:37:16 2008  NAKAMURA Usaku  <usa@r...>
+
+	* 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  <duerst@i...>
 
 	* enc/trans/utf_16_32.c: Streamline parentheses, add more
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 15169)
+++ lib/mkmf.rb	(revision 15170)
@@ -1519,11 +1519,13 @@
       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 @@
     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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]