diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 12:19:36 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 12:19:36 +0000 |
commit | 0962222856126aa7b1f5763ed48751cd700e9359 (patch) | |
tree | 8948621a9bcff4342c35441d57a6e592e0c9c247 /common.mk | |
parent | f1211dd405e78dfd3afba008598e91284cacbf69 (diff) |
merges r21602, r21603, r21607 and r21630 from trunk into ruby_1_9_1.
* configure.in (Makefile): set VCS and VCSUP to support `git svn' and git.
* Makefile.in, win32/Makefile.sub (up): split from common.mk.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r-- | common.mk | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -122,8 +122,6 @@ BOOTSTRAPRUBY = $(BASERUBY) COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb -VCS = svn - all: encs exts exts: $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY) @$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) @@ -717,8 +715,7 @@ gdb-ruby: $(PROGRAM) run.gdb PHONY dist: $(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME) -up: - @$(VCS) up "$(srcdir)" +up:: -@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(srcdir)/revision.h" help: PHONY |