diff --git a/ChangeLog b/ChangeLog
index 36b0908ec8..23a02d5240 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 13 16:20:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, Makefile.in (MAKEDIRS): used MKDIR_P instead of
+	  as_mkdir_p.  [ruby-dev:39063]
+
 Wed Aug 12 00:04:33 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/digest/sha2/sha2.h: need to include defs.h instead of inttypes.h
diff --git a/Makefile.in b/Makefile.in
index 9f4491537e..a877665f34 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,7 +89,7 @@ AS            = @AS@
 ASFLAGS       = @ASFLAGS@
 SET_LC_MESSAGES = env LC_MESSAGES=C
 
-MAKEDIRS      = @MAKEDIRS@
+MAKEDIRS      = @MKDIR_P@
 OBJEXT        = @OBJEXT@
 MANTYPE	      = @MANTYPE@
 
diff --git a/configure.in b/configure.in
index a0b6633d45..dc71247092 100644
--- a/configure.in
+++ b/configure.in
@@ -237,17 +237,21 @@ esac
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
+AC_PROG_MKDIR_P
 
 # checks for UNIX variants that set C preprocessor variables
 AC_USE_SYSTEM_EXTENSIONS
 
 AC_SUBST(RM, ['rm -f'])
 AC_SUBST(CP, ['cp'])
-if $as_mkdir_p; then
-  AC_SUBST(MAKEDIRS, ['mkdir -p'])
+if test "x$MKDIR_P" != "x -d"; then
+  MAKEDIRS="$MKDIR_P"
+elif test -n "$INSTALL"; then
+  MAKEDIRS="$INSTALL -d"
 else
-  AC_SUBST(MAKEDIRS, ['install -d'])
+  MAKEDIRS='install -d'
 fi
+AC_SUBST(MAKEDIRS)
 
 dnl check for large file stuff
 mv confdefs.h confdefs1.h