[ruby-dev:8538] Re: Enumerable and rand

なかだです。

  せっかく作ってもらった MAKEFILE_CONFIG ですが、肝心の mkmf.rb
で使ってないようで。こんな感じでどうでしょうか。


diff --recursive --unified=2 dist/lib/mkmf.rb build/lib/mkmf.rb
--- dist/lib/mkmf.rb	Tue Aug 24 23:10:14 1999
+++ build/lib/mkmf.rb	Mon Dec  6 14:58:31 1999
@@ -318,5 +318,5 @@
   system "rm -f conftest*"
   STDOUT.flush
-  if CONFIG["DLEXT"] == $OBJEXT
+  if CONFIG["DLEXT"] == CONFIG["OBJEXT"]
     libs = $libs.split
     for lib in libs
@@ -325,9 +325,9 @@
     $defs.push(format("-DEXTLIB='%s'", libs.join(",")))
   end
-  $DLDFLAGS = CONFIG["DLDFLAGS"]
+  $DLDFLAGS = MAKEFILE_CONFIG["DLDFLAGS"]
 
   if RUBY_PLATFORM =~ /beos/
-    $libs = $libs + " -lruby"
-    $DLDFLAGS = $DLDFLAGS + " -L" + CONFIG["prefix"] + "/lib"
+    $libs += " -lruby"
+    $DLDFLAGS += " -L" + MAKEFILE_CONFIG["prefix"] + "/lib"
   end
 
@@ -337,6 +337,6 @@
       defflag = "--def=" + target + ".def"
     end
-    $libs = $libs + " " + CONFIG["LIBRUBYARG"]
-    $DLDFLAGS = $DLDFLAGS + " -L$(topdir)"
+    $libs += " " + MAKEFILE_CONFIG["LIBRUBYARG"]
+    $DLDFLAGS += " -L$(topdir)"
   end
 
@@ -361,15 +361,15 @@
 hdrdir = #{$hdrdir}
 
-CC = #{CONFIG["CC"]}
+CC = #{MAKEFILE_CONFIG["CC"]}
 
-CFLAGS   = #{CONFIG["CCDLFLAGS"]} -I$(hdrdir) #{CFLAGS} #{$CFLAGS} -I#{CONFIG["includedir"]} #{$defs.join(" ")}
+CFLAGS   = #{MAKEFILE_CONFIG["CCDLFLAGS"]} -I$(hdrdir) #{CFLAGS} #{$CFLAGS} -I#{MAKEFILE_CONFIG["includedir"]} #{$defs.join(" ")}
 CXXFLAGS = $(CFLAGS)
 DLDFLAGS = #{$DLDFLAGS} #{$LDFLAGS}
-LDSHARED = #{CONFIG["LDSHARED"]} #{defflag}
+LDSHARED = #{MAKEFILE_CONFIG["LDSHARED"]} #{defflag}
 
-prefix = #{CONFIG["prefix"]}
-exec_prefix = #{CONFIG["exec_prefix"]}
-libdir = #{$libdir}
-archdir = #{$archdir}
+prefix = #{MAKEFILE_CONFIG["prefix"]}
+exec_prefix = #{MAKEFILE_CONFIG["exec_prefix"]}
+libdir = #{MAKEFILE_CONFIG["libdir"]+"/ruby/"+MAKEFILE_CONFIG["MAJOR"]+"."+MAKEFILE_CONFIG["MINOR"]}
+archdir = $(libdir)/#{MAKEFILE_CONFIG["arch"]}
 
 #### End of system configuration section. ####
@@ -380,9 +380,9 @@
 
 TARGET = #{target}
-DLLIB = $(TARGET).#{CONFIG["DLEXT"]}
+DLLIB = $(TARGET).#{MAKEFILE_CONFIG["DLEXT"]}
 
-RUBY = #{CONFIG["ruby_install_name"]}
+RUBY = #{MAKEFILE_CONFIG["ruby_install_name"]}
 
-EXEEXT = #{CONFIG["EXEEXT"]}
+EXEEXT = #{MAKEFILE_CONFIG["EXEEXT"]}
 
 all:		$(DLLIB)
@@ -404,5 +404,5 @@
   mfile.printf "\n"
 
-  if CONFIG["DLEXT"] != $OBJEXT
+  if CONFIG["DLEXT"] != CONFIG["OBJEXT"]
     mfile.printf <<EOMF
 $(DLLIB): $(OBJS)
@@ -443,5 +443,5 @@
 end
 
-$OBJEXT = CONFIG["OBJEXT"]
+$OBJEXT = MAKEFILE_CONFIG["OBJEXT"]
 $objs = nil
 $libs = "-lc"
diff --recursive --unified=2 dist/mkconfig.rb build/mkconfig.rb
--- dist/mkconfig.rb	Thu Dec  2 17:24:07 1999
+++ build/mkconfig.rb	Mon Dec  6 14:22:33 1999
@@ -36,5 +36,5 @@
     v = "  CONFIG[\"" + name + "\"] = " +
       val.sub(/^\s*(.*)\s*$/, '"\1"').gsub(/\$\{?([^(){}]+)\}?/) {
-      "\#{CONFIG[\\\"#{$1}\\\"]}"
+      "$(#{$1})"
     } + "\n"
     if fast[name]


-- 
そうだ 強気に ちょっと インチキに☆彡
    中田 "Bugるくらいがちょうどいいかも;-)" 伸悦