diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-21 21:26:56 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-21 21:26:56 +0000 |
| commit | 6abe539cfc9b91178be7e1d75173165dcf6ca1bc (patch) | |
| tree | 79e0cbed39c054882ac9753af0c74bc2f11bd92c | |
| parent | 3afa01255dfbc80bd4830d4d18f1d394c0e54202 (diff) | |
* configure.in (RMDIR): use --ignore-fail-on-non-empty if possible.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28708 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | enc/Makefile.in | 2 | ||||
| -rw-r--r-- | enc/depend | 4 |
5 files changed, 15 insertions, 6 deletions
@@ -1,4 +1,6 @@ -Thu Jul 22 03:23:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Jul 22 06:26:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (RMDIR): use --ignore-fail-on-non-empty if possible. * configure.in (RUBY_EXTERN): FUNCTION-BODY was missing. diff --git a/Makefile.in b/Makefile.in index 02cfa1c3e7..ea79f27815 100644 --- a/Makefile.in +++ b/Makefile.in @@ -105,6 +105,7 @@ MAKEDIRS = @MKDIR_P@ CP = cp MV = mv RM = rm -f +RMDIR = @RMDIR@ RMDIRS = @RMDIRS@ RMALL = @RMALL@ NM = @NM@ @@ -273,7 +274,7 @@ clean-ext distclean-ext realclean-ext:: done distclean-ext realclean-ext:: - @-rmdir ext 2> /dev/null || true + @-$(RMDIR) ext 2> /dev/null || true clean-extout: @-$(RMDIRS) $(EXTOUT) 2> /dev/null || true diff --git a/configure.in b/configure.in index 246bfdf59a..64af34bc26 100644 --- a/configure.in +++ b/configure.in @@ -361,10 +361,14 @@ AC_USE_SYSTEM_EXTENSIONS AC_SUBST(RM, ['rm -f']) AC_SUBST(CP, ['cp']) RMDIRS='$(top_srcdir)/tool/rmdirs' +RMDIR=rmdir mkdir "rmdirs_$$_test" "rmdirs_$$_test/a" -rmdir -p "rmdirs_$$_test/a" 2>/dev/null && -{ test -d "rmdirs_$$_test" || RMDIRS='rmdir -p'; } +rmdir --ignore-fail-on-non-empty "rmdirs_$$_test" 2>/dev/null && +RMDIR='rmdir --ignore-fail-on-non-empty' +$RMDIR -p "rmdirs_$$_test/a" 2>/dev/null && +{ test -d "rmdirs_$$_test" || RMDIRS="$RMDIR -p"; } rmdir "rmdirs_$$_test/a" "rmdirs_$$_test" 2>/dev/null +AC_SUBST(RMDIR) AC_SUBST(RMDIRS) AC_SUBST(RMALL, ['rm -fr']) diff --git a/enc/Makefile.in b/enc/Makefile.in index 8ba04f374a..ad0c626945 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -48,6 +48,8 @@ RUBY = $(MINIRUBY) WORKDIRS = $(ENCSODIR) $(TRANSSODIR) enc enc/trans RM = @RM@ +RMDIR = @RMDIR@ +RMDIRS = @RMDIRS@ MAKEDIRS = @MAKEDIRS@ .SUFFIXES: .trans diff --git a/enc/depend b/enc/depend index 7186179ef0..6705beb2bf 100644 --- a/enc/depend +++ b/enc/depend @@ -133,11 +133,11 @@ clean: @$(RM) <%=pathrep[clean]%> % end % %w[$(TRANSSODIR) $(ENCSODIR)].each do|dir| - @-rmdir <%=pathrep[dir]%> + @-$(RMDIR) <%=pathrep[dir]%> % end clean-srcs: @$(RM) <%=pathrep['$(TRANSCSRCS)']%> % %w[enc/trans enc].each do|dir| - @-rmdir <%=pathrep[dir]%> + @-$(RMDIR) <%=pathrep[dir]%> % end |