summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-10-22 02:20:13 (EDT)
committer P. J. McDermott <pjm@nac.net>2012-10-22 02:20:13 (EDT)
commitd7d639349ae7763a8be80a6745c1cd97c3d9082c (patch)
tree5efb0bfee3a51a1007615657153a3d29badff065
parent3b054ee49a57d73d454e45a325ec1d34f89ae9cc (diff)
Move init of opts into oh_buildsystems_init().
-rw-r--r--lib/buildsystem.sh8
1 files changed, 5 insertions, 3 deletions
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()