From d7d639349ae7763a8be80a6745c1cd97c3d9082c Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Mon, 22 Oct 2012 02:20:13 -0400 Subject: Move init of opts into oh_buildsystems_init(). --- (limited to 'lib') diff --git a/lib/buildsystem.sh b/lib/buildsystem.sh index 6d3aa03..ef668f7 100644 --- a/lib/buildsystem.sh +++ b/lib/buildsystem.sh @@ -24,9 +24,6 @@ _OH_BUILDSYSTEMS=' autoconf ' -_OH_BUILDSYSTEM_BUILD_DIR='src' -_OH_BUILDSYSTEM_SYSTEM='' - oh_buildsystems_init() { _oh_local _ohbsi_bs @@ -37,6 +34,11 @@ oh_buildsystems_init() _OH_BUILDSYSTEM_WORK_AREA="${PWD}" _OH_BUILDSYSTEM_SOURCE_DIR="$(cd src && pwd)" + + [ -z "${_OH_BUILDSYSTEM_BUILD_DIR}" ] && \ + _OH_BUILDSYSTEM_BUILD_DIR="${PWD}/src" + [ -z "${_OH_BUILDSYSTEM_SYSTEM}" ] && \ + _OH_BUILDSYSTEM_SYSTEM='' } oh_set_buildsystem_option() -- cgit v0.9.1