X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=configure;h=e5031d7616aec131166349effffd5062559376c4;hb=7fc10b339ec1c6bb0e6cb340e1ee374484933e1e;hp=5f28c8acd71683bdd547d43e880e847c5b61fbad;hpb=79ad5e5ec3e1d5d01ef90567241224f7aec5e701;p=cc0%2Fargeo-build.git

diff --git a/configure b/configure
index 5f28c8a..e5031d7 100755
--- a/configure
+++ b/configure
@@ -3,11 +3,16 @@
 # We build where we are
 SDK_BUILD_BASE=$(pwd -P)/output
 
+if [ -z "$SDK_SRC_BASE" ]
+then
+SDK_SRC_BASE=$(pwd -P)
+echo "Script variable SDK_SRC_BASE not set, assuming Argeo Build is building itself and using the local directory"
+fi
+
 SDK_MK=$SDK_SRC_BASE/sdk.mk
 
 if [ -f "$SDK_MK" ]; 
 then
-
 echo "File $SDK_MK already exists. Remove it in order to configure a new build location:"
 echo "rm $SDK_MK"
 exit 1
@@ -16,8 +21,8 @@ else
 
 if [ -z "$JAVA_HOME" ]
 then
-JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac))))
-echo "Environment variable JAVA_HOME not set, using $JAVA_HOME"
+JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java))))
+echo "Environment variable JAVA_HOME not set, using $JAVA_HOME of $(which java)"
 fi
 
 # Create build directory, so that it can be used right away