[前][次][番号順一覧][スレッド一覧]

ruby-changes:12913

From: naruse <ko1@a...>
Date: Tue, 25 Aug 2009 22:36:48 +0900 (JST)
Subject: [ruby-changes:12913] Ruby:r24649 (trunk): Set 'mkdir -p' to MKDIR_P when AC_PROG_MKDIR_P doesn't set MKDIR_P.

naruse	2009-08-25 22:36:32 +0900 (Tue, 25 Aug 2009)

  New Revision: 24649

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24649

  Log:
    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.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 24648)
+++ configure.in	(revision 24649)
@@ -309,6 +309,15 @@
 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_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'])
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24648)
+++ ChangeLog	(revision 24649)
@@ -1,3 +1,8 @@
+Tue Aug 25 22:31:51 2009  NARUSE, Yui  <naruse@r...>
+
+	* configure.in (MKDIR_P): Set 'mkdir -p' to MKDIR_P
+	  when AC_PROG_MKDIR_P doesn't set MKDIR_P.
+
 Tue Aug 25 17:38:22 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* bignum.c (rb_big_clone, bigmul1_normal, bigdivrem): trivial

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]