ruby-changes:16712
From: nobu <ko1@a...>
Date: Thu, 22 Jul 2010 06:28:27 +0900 (JST)
Subject: [ruby-changes:16712] Ruby:r28708 (trunk): * configure.in (RMDIR): use --ignore-fail-on-non-empty if possible.
nobu 2010-07-22 06:26:56 +0900 (Thu, 22 Jul 2010) New Revision: 28708 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28708 Log: * configure.in (RMDIR): use --ignore-fail-on-non-empty if possible. Modified files: trunk/ChangeLog trunk/Makefile.in trunk/configure.in trunk/enc/Makefile.in trunk/enc/depend Index: configure.in =================================================================== --- configure.in (revision 28707) +++ configure.in (revision 28708) @@ -361,10 +361,14 @@ 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']) Index: ChangeLog =================================================================== --- ChangeLog (revision 28707) +++ ChangeLog (revision 28708) @@ -1,5 +1,7 @@ -Thu Jul 22 03:23:03 2010 Nobuyoshi Nakada <nobu@r...> +Thu Jul 22 06:26:48 2010 Nobuyoshi Nakada <nobu@r...> + * configure.in (RMDIR): use --ignore-fail-on-non-empty if possible. + * configure.in (RUBY_EXTERN): FUNCTION-BODY was missing. Thu Jul 22 03:02:55 2010 Eric Hodel <drbrain@s...> Index: enc/Makefile.in =================================================================== --- enc/Makefile.in (revision 28707) +++ enc/Makefile.in (revision 28708) @@ -48,6 +48,8 @@ WORKDIRS = $(ENCSODIR) $(TRANSSODIR) enc enc/trans RM = @RM@ +RMDIR = @RMDIR@ +RMDIRS = @RMDIRS@ MAKEDIRS = @MAKEDIRS@ .SUFFIXES: .trans Index: enc/depend =================================================================== --- enc/depend (revision 28707) +++ enc/depend (revision 28708) @@ -133,11 +133,11 @@ @$(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 Index: Makefile.in =================================================================== --- Makefile.in (revision 28707) +++ Makefile.in (revision 28708) @@ -105,6 +105,7 @@ CP = cp MV = mv RM = rm -f +RMDIR = @RMDIR@ RMDIRS = @RMDIRS@ RMALL = @RMALL@ NM = @NM@ @@ -273,7 +274,7 @@ 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/