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

ruby-changes:12797

From: nobu <ko1@a...>
Date: Thu, 13 Aug 2009 16:20:37 +0900 (JST)
Subject: [ruby-changes:12797] Ruby:r24525 (ruby_1_8, trunk): * configure.in, Makefile.in (MAKEDIRS): used MKDIR_P instead of

nobu	2009-08-13 16:20:16 +0900 (Thu, 13 Aug 2009)

  New Revision: 24525

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

  Log:
    * configure.in, Makefile.in (MAKEDIRS): used MKDIR_P instead of
      as_mkdir_p.  [ruby-dev:39063]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/Makefile.in
    branches/ruby_1_8/configure.in
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/configure.in
    trunk/enc/Makefile.in

Index: configure.in
===================================================================
--- configure.in	(revision 24524)
+++ configure.in	(revision 24525)
@@ -303,6 +303,7 @@
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
+AC_PROG_MKDIR_P
 
 AC_CHECK_TOOL(DOT, dot)
 AC_CHECK_TOOL(DOXYGEN, doxygen)
@@ -312,8 +313,10 @@
 
 AC_SUBST(RM, ['rm -f'])
 AC_SUBST(CP, ['cp'])
-if $as_mkdir_p; then
-  MAKEDIRS='mkdir -p'
+if test "x$MKDIR_P" != "x -d"; then
+  MAKEDIRS="$MKDIR_P"
+elif test -n "$INSTALL"; then
+  MAKEDIRS="$INSTALL -d"
 else
   MAKEDIRS='install -d'
 fi
@@ -2522,7 +2525,7 @@
 AC_SUBST(MANTYPE)
 
 arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
-$MAKEDIRS "${arch_hdrdir}"
+AS_MKDIR_P("${arch_hdrdir}")
 config_h="${arch_hdrdir}/config.h"
 tr -d '\015' < confdefs.h | grep -v "^#define PACKAGE_" |
 ${srcdir}/tool/ifchange "${config_h}" -
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24524)
+++ ChangeLog	(revision 24525)
@@ -1,3 +1,8 @@
+Thu Aug 13 16:20:07 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in, Makefile.in (MAKEDIRS): used MKDIR_P instead of
+	  as_mkdir_p.  [ruby-dev:39063]
+
 Thu Aug 13 15:37:33 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* regenc.c (onigenc_strlen_null, onigenc_str_bytelen_null): fixed
Index: enc/Makefile.in
===================================================================
--- enc/Makefile.in	(revision 24524)
+++ enc/Makefile.in	(revision 24525)
@@ -48,7 +48,7 @@
 WORKDIRS = $(ENCSODIR) $(TRANSSODIR) enc enc/trans
 
 RM = @RM@
-MAKEDIRS = @MAKEDIRS@
+MAKEDIRS = @MKDIR_P@
 
 .SUFFIXES: .trans
 
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 24524)
+++ Makefile.in	(revision 24525)
@@ -97,7 +97,7 @@
 EXTSTATIC     = @EXTSTATIC@
 SET_LC_MESSAGES = env LC_MESSAGES=C
 
-MAKEDIRS      = @MAKEDIRS@
+MAKEDIRS      = @MKDIR_P@
 CP            = cp
 MV            = mv
 RM            = rm -f
Index: ruby_1_8/Makefile.in
===================================================================
--- ruby_1_8/Makefile.in	(revision 24524)
+++ ruby_1_8/Makefile.in	(revision 24525)
@@ -89,7 +89,7 @@
 ASFLAGS       = @ASFLAGS@
 SET_LC_MESSAGES = env LC_MESSAGES=C
 
-MAKEDIRS      = @MAKEDIRS@
+MAKEDIRS      = @MKDIR_P@
 OBJEXT        = @OBJEXT@
 MANTYPE	      = @MANTYPE@
 
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 24524)
+++ ruby_1_8/configure.in	(revision 24525)
@@ -237,17 +237,21 @@
 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
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 24524)
+++ ruby_1_8/ChangeLog	(revision 24525)
@@ -1,3 +1,8 @@
+Thu Aug 13 16:20:07 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* ext/digest/sha2/sha2.h: need to include defs.h instead of inttypes.h

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

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