summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-17 10:40:51 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-17 10:40:51 +0000
commitfe011304e7cddc0080ca59cb0df0bbe21bf203bb (patch)
treec3d1dcf9c392db9b59c94946387a5751c50f8db0
parentcfa14a55540e0548cb4d9ecb7de09e2b74c4cd87 (diff)
* 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
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.in2
-rw-r--r--configure.in4
-rw-r--r--win32/Makefile.sub4
4 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index fb33e1732e4..6fed1d8f5f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/Makefile.in b/Makefile.in
index 73a3512972e..5f6316c67a5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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 \
diff --git a/configure.in b/configure.in
index 77c00343a59..264903ea3fc 100644
--- a/configure.in
+++ b/configure.in
@@ -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)'
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index ee712835b24..a57e79bd4a9 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