diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:55:18 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:55:18 +0000 |
| commit | 40025d402c66ba9aa043852971deb9d49c807d0e (patch) | |
| tree | 7ab811f668aab727616db8014cd968e83a634838 | |
| parent | 85f9d86cb8c34fb1534b536d16b2558ba5bd9d99 (diff) | |
merges r20965 from trunk into ruby_1_9_1.
* configure.in (Makefile): removes GNU make specific files on
distclean.
* Makefile.in (distclean-ext): removes extension directories.
* lib/mkmf.rb (try_do): removes conftest.dSYM
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | lib/mkmf.rb | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 39fc686b3e..d317412df2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -224,7 +224,8 @@ clean-ext distclean-ext realclean-ext:: @find ext -name Makefile | sort | while read mk; do \ dir=`dirname "$$mk"`; \ echo $(@:-ext=)ing `expr "$$dir" : 'ext/\(.*\)'`; \ - (cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)); \ + (cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)) && \ + test $@ != clean-ext && rmdir -p "$$dir" 2> /dev/null; \ done ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) diff --git a/configure.in b/configure.in index f20cf35440..e2050a37d1 100644 --- a/configure.in +++ b/configure.in @@ -2140,6 +2140,8 @@ AC_CONFIG_FILES(Makefile, [{ if test "$gnumake" != yes; then echo ['$(MKFILES): $(srcdir)/common.mk'] sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk + else + echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk' fi } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile], [RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT gnumake=$gnumake]) diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 615b898429..5686f8137b 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -194,6 +194,10 @@ def rm_f(*files) FileUtils.rm_f(Dir[*files]) end +def rm_rf(*files) + FileUtils.rm_rf(Dir[*files]) +end + # Returns time stamp of the +target+ file if it exists and is newer # than or equal to all of +times+. def modified?(target, times) @@ -361,6 +365,7 @@ MSG xsystem(command) ensure log_src(src) + rm_rf 'conftest.dSYM' end def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) @@ -1894,7 +1899,6 @@ clean: \t\t@-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep}) distclean: clean -\t\t@-$(RM_RF) conftest.dSYM \t\t@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log \t\t@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep}) |