diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-14 03:01:42 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-14 03:01:42 +0000 |
commit | a91845f5b3ec726e08501cc6597c1788b223cd41 (patch) | |
tree | ef980d69d01037963dc54a49776acf7389f62e04 /Makefile.in | |
parent | 0d8df8889342b3d235ffcea209beea5032c9a711 (diff) | |
download | bundler-a91845f5b3ec726e08501cc6597c1788b223cd41.tar.gz |
* configure.in (gnumake): check for GNU make.
* Makefile.in (uncommon.mk): includes filtered common.mk.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index ab3fa699cb..fc723b6ea2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -158,7 +158,7 @@ fake.rb: Makefile Makefile: $(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in -$(MKFILES): config.status $(srcdir)/common.mk +$(MKFILES): config.status MAKE=$(MAKE) $(SHELL) ./config.status @{ \ echo "all:; -@rm -f conftest.mk"; \ @@ -168,6 +168,9 @@ $(MKFILES): config.status $(srcdir)/common.mk $(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \ { echo "Makefile updated, restart."; exit 1; } +uncommon.mk: $(srcdir)/common.mk + sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@ + config.status: $(srcdir)/configure $(srcdir)/enc/Makefile.in MINIRUBY="$(MINIRUBY)" $(SHELL) ./config.status --recheck |