From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 24 May 2010 11:17:44 +0000 (+0200)
Subject: fix the way the default build URL is set
X-Git-Tag: 5.0-rc11~95
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=840ba9ac6e6be2695a145641d151622f3ac99667;p=build.git

fix the way the default build URL is set
---

diff --git a/Makefile b/Makefile
index 6ba96030..c764979e 100644
--- a/Makefile
+++ b/Makefile
@@ -154,16 +154,16 @@ include $(PLDISTROTAGS)
 # this used to be set in the -tags.mk files, but that turned out to require
 # error-prone duplicate changes 
 # so now the nightly build script sets this to what it is currently using
-# we set a default in case we run the build manually:
-# if the local directory was svn checked out, then use the corresponding URL
-svn-info-url-line := $(shell svn info 2> /dev/null | grep URL:)
-default-build-SVNPATH := $(lastword $(svn-info-url-line))
-# otherwise, use this hard-coded default
-ifeq "$(default-build-SVNPATH)" ""
-default-build-SVNPATH := http://svn.planet-lab.org/svn/build/trunk
+# 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
-# use default if necessary
-build-SVNPATH ?= $(default-build-SVNPATH)
+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