X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=configure;h=5d3e45ed8031809c5a2f00bbb68edd3b5a1aeb26;hb=3714839e09d67535491b15ef560b2cb3fdf482db;hp=56a8fb7f4509c56919e43ab8151b2d7762e6e0fa;hpb=a261043de5f9d90373bb1e7f395e3371ba9e67ef;p=cc0%2Fargeo-build.git

diff --git a/configure b/configure
index 56a8fb7..5d3e45e 100755
--- a/configure
+++ b/configure
@@ -16,8 +16,8 @@ else
 
 if [ -z "$JAVA_HOME" ]
 then
-echo "Environment variable JAVA_HOME must be set"
-exit 1
+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
@@ -35,8 +35,8 @@ SDK_SRC_BASE := $SDK_SRC_BASE
 SDK_BUILD_BASE := $SDK_BUILD_BASE
 JAVA_HOME := $JAVA_HOME
 
-include \$(SDK_SRC_BASE)/branch.mk
-include \$(SDK_SRC_BASE)/sdk/branches/\$(BRANCH).bnd
+-include \$(SDK_SRC_BASE)/branch.mk
+-include \$(SDK_SRC_BASE)/sdk/branches/\$(BRANCH).bnd
 EOF