* lib/mkmf.rb (with_destdir): new.

* lib/mkmf.rb: prefix target directories with $(DESTDIR) all.

* lib/mkmf.rb: no need to mkdir $(libdir)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,11 @@
+Fri Dec 21 01:17:57 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* lib/mkmf.rb (with_destdir): new.
+
+	* lib/mkmf.rb: prefix target directories with $(DESTDIR) all.
+
+	* lib/mkmf.rb: no need to mkdir $(libdir)
+
 Thu Dec 20 10:37:32 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* intern.h: added prototypes: rb_cv_set(), rb_cv_get(),

lib/mkmf.rb

@@ -360,6 +360,10 @@ def dir_config(target, idefault=nil, ldefault=nil)
   [idir, ldir]
 end
 
+def with_destdir(dir)
+  /^\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
+end
+
 def create_makefile(target, srcdir = File.dirname($0))
   save_libs = $libs.dup
   save_libpath = $LIBPATH.dup
@@ -451,14 +455,14 @@ def create_makefile(target, srcdir = File.dirname($0))
   ""
 end
 }
-prefix = $(DESTDIR)#{CONFIG["prefix"].sub(drive, '')}
-exec_prefix = #{CONFIG["exec_prefix"].sub(drive, '')}
-libdir = #{$libdir.sub(drive, '')}
-rubylibdir = #{$rubylibdir.sub(drive, '')}
-archdir = #{$archdir.sub(drive, '')}
-sitedir = #{$sitedir.sub(drive, '')}
-sitelibdir = #{$sitelibdir.sub(drive, '')}
-sitearchdir = #{$sitearchdir.sub(drive, '')}
+prefix = #{with_destdir CONFIG["prefix"].sub(drive, '')}
+exec_prefix = #{with_destdir CONFIG["exec_prefix"].sub(drive, '')}
+libdir = #{with_destdir $libdir.sub(drive, '')}
+rubylibdir = #{with_destdir $rubylibdir.sub(drive, '')}
+archdir = #{with_destdir $archdir.sub(drive, '')}
+sitedir = #{with_destdir $sitedir.sub(drive, '')}
+sitelibdir = #{with_destdir $sitelibdir.sub(drive, '')}
+sitearchdir = #{with_destdir $sitearchdir.sub(drive, '')}
 target_prefix = #{target_prefix}
 
 #### End of system configuration section. ####
@@ -499,7 +503,7 @@ def create_makefile(target, srcdir = File.dirname($0))
 
   mfile.printf <<EOMF
 $(sitearchdir)$(target_prefix)/$(DLLIB): $(DLLIB)
-	@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(libdir) $(sitearchdir)$(target_prefix)
+	@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(sitearchdir)$(target_prefix)
 	@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(DLLIB) $(sitearchdir)$(target_prefix)/$(DLLIB)
 EOMF
   install_rb(mfile, "$(sitelibdir)$(target_prefix)", srcdir)

version.h

@@ -1,4 +1,4 @@
 #define RUBY_VERSION "1.6.6"
-#define RUBY_RELEASE_DATE "2001-12-19"
+#define RUBY_RELEASE_DATE "2001-12-20"
 #define RUBY_VERSION_CODE 166
-#define RUBY_RELEASE_CODE 20011219
+#define RUBY_RELEASE_CODE 20011220