diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | win32/Makefile.sub | 7 |
2 files changed, 2 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 9997ee255f..d068efddd4 100644 --- a/configure.ac +++ b/configure.ac @@ -3908,20 +3908,12 @@ AC_CONFIG_FILES(Makefile, [ { AS_IF([test ${VCS+set}], [ : - ], [svn info "$srcdir" > /dev/null 2>&1], [ - VCS='svn' ], [git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`], [ - AS_IF([test -d "$git_dir/svn"], [ - VCS='$(GIT) svn' - ], [ - VCS='$(GIT)' - ]) + VCS='$(GIT)' ], [ VCS='echo cannot' ]) AS_CASE("$VCS", - [svn], [VCSUP='$(VCS) up $(SVNUPOPTIONS)'], - ['$(GIT) svn'], [VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'], ['$(GIT)'|git], [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'], [VCSUP='$(VCS)']) sed -n \ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ff1a86597f..756ee7a280 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -495,12 +495,7 @@ HAVE_GIT = no ! endif !endif -!if exist($(srcdir)/.svn) -VCS = svn -VCSUP = $(VCS) up $(SVNUPOPTIONS) -!else if exist($(srcdir)/.git/svn) -VCS = $(GIT) svn -VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS) +!if defined(VCS) !else if exist($(srcdir)/.git) VCS = $(GIT) VCSUP = $(VCS) pull $(GITPULLOPTIONS) |