mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@21630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
cfa14a5554
commit
fe011304e7
4 changed files with 13 additions and 5 deletions
|
@ -1,3 +1,11 @@
|
|||
Sat Jan 17 19:33:48 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
|
||||
|
||||
* 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.
|
||||
|
||||
Sat Jan 17 19:16:16 2009 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* ext/socket/mkconstants.rb: generate a header file for generated
|
||||
|
|
|
@ -249,7 +249,7 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
|
|||
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
|
||||
|
||||
up::
|
||||
@LC_TIME=C $(VCSUP) "$(srcdir)"
|
||||
@LC_TIME=C cd "$(srcdir)" && $(VCSUP)
|
||||
|
||||
update-rubyspec:
|
||||
@if [ -d $(srcdir)/spec/mspec ]; then \
|
||||
|
|
|
@ -2172,10 +2172,10 @@ AC_CONFIG_FILES(Makefile, [{
|
|||
VCSUP='$(VCS) up $(SVNUPOPTIONS)'
|
||||
elif test -d "$srcdir/.git/svn"; then
|
||||
VCS='git svn'
|
||||
VCSUP='$(VCS) up $(SVNUPOPTIONS)'
|
||||
VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'
|
||||
elif test -d "$srcdir/.git"; then
|
||||
VCS='git'
|
||||
VCSUP='$(VCS) up $(GITUPOPTIONS)'
|
||||
VCSUP='$(VCS) pull $(GITPULLOPTIONS)'
|
||||
else
|
||||
VCS='echo cannot'
|
||||
VCSUP='$(VCS)'
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue