diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 10:40:51 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 10:40:51 +0000 |
| commit | 4b28c90e3656b55e46755abe7cbd7c0235d7fb72 (patch) | |
| tree | c3d1dcf9c392db9b59c94946387a5751c50f8db0 /win32/Makefile.sub | |
| parent | f55b900b186aafc50cc3ef464853182777c01b68 (diff) | |
| download | ruby-4b28c90e3656b55e46755abe7cbd7c0235d7fb72.tar.gz ruby-4b28c90e3656b55e46755abe7cbd7c0235d7fb72.tar.xz ruby-4b28c90e3656b55e46755abe7cbd7c0235d7fb72.zip | |
* configure.in (VCSUP): fixed the cases for git-svn or git.
* win32/Makefile.sub (VCSUP): ditto.
* Makefile.in (up): `cd' is necessary for git and git-svn.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ee712835b..a57e79bd4 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -282,10 +282,10 @@ VCS = svn VCSUP = $(VCS) up $(SVNUPOPTIONS) !else if exist($(srcdir)/.git/svn) VCS = git svn -VCSUP = $(VCS) up $(SVNUPOPTIONS) +VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS) !else if exist($(srcdir)/.git) VCS = git -VCSUP = $(VCS) up $(GITUPOPTIONS) +VCSUP = $(VCS) pull $(GITPULLOPTIONS) !endif all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk |