From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 24 May 2010 13:44:06 +0000 (+0200)
Subject: should work for bot svn and git build modules
X-Git-Tag: 5.0-rc11~94
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fb8d937a3899f28d7a0ea8d48849b44022b0bd7b;p=build.git

should work for bot svn and git build modules
---

diff --git a/Makefile b/Makefile
index c764979e..770dcdef 100644
--- a/Makefile
+++ b/Makefile
@@ -155,15 +155,13 @@ include $(PLDISTROTAGS)
 # error-prone duplicate changes 
 # so now the nightly build script sets this to what it is currently using
 # in case we run this manually, i.e. if neither build-SVNPATH nor build-GITPATH is set
-# set build-GITPATH from the current repo
-ifeq "$(build-SVNPATH)" ""
-ifeq "$(build-GITPATH)" ""
-build-GITPATH := $(shell git config remote.origin.url)
-endif
+ifeq "$(build-SVNPATH)$(build-GITPATH)" ""
+build-GITPATH-local := $(shell git config remote.origin.url)
+ifneq "$(build-GITPATH-local)" ""
+build-GITPATH := $(build-GITPATH-local)
+else
+build-SVNPATH := $(lastword $(shell svn info 2> /dev/null | grep URL:))
 endif
-# the sentence for svn used to be
-#svn-info-url-line := $(shell svn info 2> /dev/null | grep URL:)
-#default-build-SVNPATH := $(lastword $(svn-info-url-line))
 
 ####################
 define remote_pldistro