diff --git a/ChangeLog b/ChangeLog
index f4144b8c51..5de65c8022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Fri May 13 23:44:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: keep srcdir unexpanded.
+
+	* lib/mkmf.rb (create_makefile): quote topdir and hdrdir if necessary.
+	  fixed: [ruby-core:04932]
+
+	* lib/mkmf.rb (configuration), {bcc32,win32,wince}/Makefile.sub: make
+	  also INSTALL_PROG and INSTALL_DATA system dependent.
+	  fixed: [ruby-core:04931]
+
 Fri May 13 23:32:55 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (unknown_node): add volatile directive to prototype.
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 2005c2626a..d8228a26d3 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -339,6 +339,8 @@ s,@LN_S@,$(LN_S),;t t
 s,@SET_MAKE@,$(SET_MAKE),;t t
 s,@CP@,copy > nul,;t t
 s,@INSTALL@,copy > nul,;t t
+s,@INSTALL_PROG@,$$(INSTALL),;t t
+s,@INSTALL_DATA@,$$(INSTALL),;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
 s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 230aab3bd4..c63236c590 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -22,9 +22,9 @@ $compiled = {}
 $:.replace([Dir.pwd])
 require 'rbconfig'
 
-srcdir = File.expand_path("../..", __FILE__)
+srcdir = File.dirname(File.dirname(__FILE__))
 
-$:.unshift(srcdir, srcdir+"/lib")
+$:.unshift(srcdir, File.expand_path("lib", srcdir))
 
 $topdir = "."
 $top_srcdir = srcdir
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 59b044cf09..987c4cb5c4 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -846,8 +846,8 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}}
-topdir = #{$extmk ? CONFIG["topdir"] : $topdir}
-hdrdir = #{$extmk ? CONFIG["hdrdir"] : '$(topdir)'}
+topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote}
+hdrdir = #{$extmk ? CONFIG["hdrdir"].quote : '$(topdir)'}
 VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
 }
   drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/
@@ -890,8 +890,8 @@ RUBY = #{($nmake && !$extmk && !$configure_args.has_key?('--ruby')) ? '$(ruby:/=
 RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'}
 MAKEDIRS = #{config_string('MAKEDIRS') || '@$(RUBY) -run -e mkdir -- -p'}
 INSTALL = #{config_string('INSTALL') || '@$(RUBY) -run -e install -- -vp'}
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 0644
+INSTALL_PROG = #{config_string('INSTALL_PROG') || '$(INSTALL) -m 0755'}
+INSTALL_DATA = #{config_string('INSTALL_DATA') || '$(INSTALL) -m 0644'}
 COPY = #{config_string('CP') || '@$(RUBY) -run -e cp -- -v'}
 
 #### End of system configuration section. ####
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 3254f92141..660edd3a4a 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -361,6 +361,8 @@ s,@LN_S@,$(LN_S),;t t
 s,@SET_MAKE@,$(SET_MAKE),;t t
 s,@CP@,copy > nul,;t t
 s,@INSTALL@,copy > nul,;t t
+s,@INSTALL_PROG@,$$(INSTALL),;t t
+s,@INSTALL_DATA@,$$(INSTALL),;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
 s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index d4a5d18155..3649d77632 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -366,6 +366,8 @@ s,@LN_S@,$(LN_S),;t t
 s,@SET_MAKE@,$(SET_MAKE),;t t
 s,@CP@,copy > nul,;t t
 s,@INSTALL@,copy > nul,;t t
+s,@INSTALL_PROG@,$$(INSTALL),;t t
+s,@INSTALL_DATA@,$$(INSTALL),;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj isinf.obj isnan.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
 s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t