diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-25 13:36:32 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-25 13:36:32 +0000 |
commit | 0fd1688bf5acd207a81a1600eb0b43a7a059e356 (patch) | |
tree | 37f3714d3d402df3d3f0446e34ffca9bce015425 /configure.in | |
parent | ebbe19e1ad98167417ffff29048c83e1aaa8b547 (diff) | |
download | ruby-0fd1688bf5acd207a81a1600eb0b43a7a059e356.tar.gz |
Set 'mkdir -p' to MKDIR_P when AC_PROG_MKDIR_P doesn't set MKDIR_P.
* configure.in (MKDIR_P): Set 'mkdir -p' to MKDIR_P
when AC_PROG_MKDIR_P doesn't set MKDIR_P.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 69f292b16f..86692b8628 100644 --- a/configure.in +++ b/configure.in @@ -309,6 +309,15 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_INSTALL AC_PROG_MKDIR_P +if test "x$MKDIR_P" != "x -d"; then +elif test x"$as_mkdir_p" != xfalse; then + MKDIR_P='mkdir -p' + echo "use 'mkdir -p' as MKDIR_P" +else + AC_MSG_ERROR([mkdir -p is required]) +fi +MAKEDIRS="$MKDIR_P" +AC_SUBST(MAKEDIRS) AC_CHECK_TOOL(DOT, dot) AC_CHECK_TOOL(DOXYGEN, doxygen) @@ -318,14 +327,6 @@ AC_USE_SYSTEM_EXTENSIONS AC_SUBST(RM, ['rm -f']) AC_SUBST(CP, ['cp']) -if test "x$MKDIR_P" != "x -d"; then - MAKEDIRS="$MKDIR_P" -elif test -n "$INSTALL"; then - MAKEDIRS="$INSTALL -d" -else - MAKEDIRS='install -d' -fi -AC_SUBST(MAKEDIRS) AC_SUBST(RMDIRS, ['$(top_srcdir)/tool/rmdirs']) AC_SUBST(RMALL, ['rm -fr']) |