* 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
cfis · Jul 21, 2010 · 6abe539 · 6abe539
1 parent 3afa012
commit 6abe539
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,6 @@
-Thu Jul 22 03:23:03 2010  Nobuyoshi Nakada  <[email protected]>
+Thu Jul 22 06:26:48 2010  Nobuyoshi Nakada  <[email protected]>
+
+	* 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
@@ -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
@@ -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
@@ -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
@@ -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