X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=configure;h=5d3e45ed8031809c5a2f00bbb68edd3b5a1aeb26;hb=3bf6a139f456ff71bec3bc61d8cd14a1d058133a;hp=9b3e9804b04280910d6df08fd74ba0fe4cf4079c;hpb=2cb8a40febfe1b42ab2aebecbf6e0ec06b2c5e4d;p=cc0%2Fargeo-build.git diff --git a/configure b/configure old mode 100644 new mode 100755 index 9b3e980..5d3e45e --- a/configure +++ b/configure @@ -3,15 +3,8 @@ # We build where we are SDK_BUILD_BASE=$(pwd -P)/output -# Source are located where this script is -SDK_SRC_BASE="$(cd "$(dirname "$0")"; pwd -P)" - SDK_MK=$SDK_SRC_BASE/sdk.mk -#echo SDK_BUILD_BASE=$SDK_BUILD_BASE -#echo SDK_SRC_BASE=$SDK_SRC_BASE -#echo SDK_MK=$SDK_MK - if [ -f "$SDK_MK" ]; then @@ -23,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 @@ -42,7 +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)/branch.mk +-include \$(SDK_SRC_BASE)/sdk/branches/\$(BRANCH).bnd EOF