diff --git a/ChangeLog b/ChangeLog
index c4646679fd..a29b67011f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Jan 20 04:14:17 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/mkmf.rb (egrep_cpp): use inspect to show options.
+
+	* lib/mkmf.rb (dir_config): prior configured directories to
+	  defaults.
+
+	* lib/mkmf.rb (dir_config): extract first word to determin
+	  make command type.
+
 Mon Jan 20 02:15:53 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* ext/aix_mksym.rb: no longer used.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 0be7b73279..8479da5dff 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -279,7 +279,7 @@ def egrep_cpp(pat, src, opt="")
   create_tmpsrc(src)
   xpopen(cpp_command('', opt)) do |f|
     if Regexp === pat
-      puts("    ruby -ne 'print if /#{pat.source}/'")
+      puts("    ruby -ne 'print if #{pat.inspect}'")
       f.grep(pat) {|l|
 	puts "#{f.lineno}: #{l}"
 	return true
@@ -513,11 +513,13 @@ def dir_config(target, idefault=nil, ldefault=nil)
 
   if idir
     idircflag = "-I" + idir
-    $CPPFLAGS += " " + idircflag unless $CPPFLAGS.split.include?(idircflag)
+    unless Shellwords.shellwords($CPPFLAGS).include?(idircflag)
+      $CPPFLAGS = idircflag + " " + $CPPFLAGS
+    end
   end
 
   if ldir
-    $LIBPATH << ldir unless $LIBPATH.include?(ldir)
+    $LIBPATH.unshift(ldir) unless $LIBPATH.include?(ldir)
   end
 
   [idir, ldir]
@@ -814,12 +816,13 @@ init_mkmf
 dir_config("opt")
 
 $make = with_config("make-prog", ENV["MAKE"] || "make")
+make, = Shellwords.shellwords($make)
 $nmake = nil
 case
 when $mswin
-  $nmake = ?m if /nmake/i =~ $make
+  $nmake = ?m if /nmake/i =~ make
 when $bccwin
-  $nmake = ?b if /Borland/i =~ `#$make -h`
+  $nmake = ?b if /Borland/i =~ `#{make} -h`
 end
 
 Config::CONFIG["srcdir"] = CONFIG["srcdir"] =