diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-13 07:20:16 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-13 07:20:16 +0000 |
| commit | 2e5d88f13e8dee0dd8fc6b2fa2796cab710f4806 (patch) | |
| tree | b096876143f7daa26e19952635afdc1dea87d350 | |
| parent | 479a04a6025877f9534a2caf8d8a612c136955ca (diff) | |
| download | ruby-2e5d88f13e8dee0dd8fc6b2fa2796cab710f4806.tar.gz ruby-2e5d88f13e8dee0dd8fc6b2fa2796cab710f4806.tar.xz ruby-2e5d88f13e8dee0dd8fc6b2fa2796cab710f4806.zip | |
* configure.in, Makefile.in (MAKEDIRS): used MKDIR_P instead of
as_mkdir_p. [ruby-dev:39063]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | enc/Makefile.in | 2 |
4 files changed, 13 insertions, 5 deletions
@@ -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] + Thu Aug 13 15:37:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * regenc.c (onigenc_strlen_null, onigenc_str_bytelen_null): fixed diff --git a/Makefile.in b/Makefile.in index e096f7e5d..ed312e50d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -97,7 +97,7 @@ SETUP = EXTSTATIC = @EXTSTATIC@ SET_LC_MESSAGES = env LC_MESSAGES=C -MAKEDIRS = @MAKEDIRS@ +MAKEDIRS = @MKDIR_P@ CP = cp MV = mv RM = rm -f diff --git a/configure.in b/configure.in index c0b2d62f2..e8e919e82 100644 --- a/configure.in +++ b/configure.in @@ -303,6 +303,7 @@ esac 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_USE_SYSTEM_EXTENSIONS 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 @@ fi 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}" - diff --git a/enc/Makefile.in b/enc/Makefile.in index 8ba04f374..129220719 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -48,7 +48,7 @@ RUBY = $(MINIRUBY) WORKDIRS = $(ENCSODIR) $(TRANSSODIR) enc enc/trans RM = @RM@ -MAKEDIRS = @MAKEDIRS@ +MAKEDIRS = @MKDIR_P@ .SUFFIXES: .trans |