From: Mathieu <mbaudier@argeo.org>
Date: Fri, 10 Mar 2023 09:59:10 +0000 (+0100)
Subject: Make configure script more robust
X-Git-Tag: v2.3.5~119
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=79ad5e5ec3e1d5d01ef90567241224f7aec5e701;p=cc0%2Fargeo-build.git

Make configure script more robust
---

diff --git a/configure b/configure
index 56a8fb7..5f28c8a 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 javac))))
+echo "Environment variable JAVA_HOME not set, using $JAVA_HOME"
 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