X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=configure;h=9b3e9804b04280910d6df08fd74ba0fe4cf4079c;hb=def1b847ee067994c32f49107e22d3c04eac2b0e;hp=c92fa222f7b6f33310244a4edae7d162d5d5fe0f;hpb=163f18fdace8b3171abe3a3b2282d040b205e0c8;p=lgpl%2Fargeo-commons.git

diff --git a/configure b/configure
index c92fa222f..9b3e9804b 100644
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # We build where we are
-SDK_BUILD_BASE=$(pwd -P)/build
+SDK_BUILD_BASE=$(pwd -P)/output
 
 # Source are located where this script is
 SDK_SRC_BASE="$(cd "$(dirname "$0")"; pwd -P)"
@@ -21,6 +21,12 @@ exit 1
 
 else
 
+if [ -z "$JAVA_HOME" ]
+then
+echo "Environment variable JAVA_HOME must be set"
+exit 1
+fi
+
 # Create build directory, so that it can be used right away
 # and we check whether we have the rights
 mkdir -p $SDK_BUILD_BASE
@@ -34,13 +40,14 @@ fi
 cat > "$SDK_MK" <<EOF
 SDK_SRC_BASE := $SDK_SRC_BASE
 SDK_BUILD_BASE := $SDK_BUILD_BASE
+JAVA_HOME := $JAVA_HOME
 
-include \$(SDK_SRC_BASE)/branch.properties
-include \$(SDK_SRC_BASE)/sdk/includes.mk
+include \$(SDK_SRC_BASE)/branch.mk
 EOF
 
 
 echo SDK was configured.
+echo "JAVA_HOME        : $JAVA_HOME"
 echo "Base for sources : $SDK_SRC_BASE"
 echo "Base for builds  : $SDK_BUILD_BASE"
 exit 0