diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-06 19:45:44 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-07 10:25:47 +0200 |
| commit | 5130ad248d1c15e80646c0f7f0c5225e88e78859 (patch) | |
| tree | 7a108b4d3c30ef05fd03fc733ead9c37e76cbc0d /scripts/lib/ptxd_make_world_common.sh | |
| parent | f4e0c5a2e7048a798eed47bdad28e09b1ed29deb (diff) | |
| download | ptxdist-5130ad248d1c15e80646c0f7f0c5225e88e78859.tar.gz ptxdist-5130ad248d1c15e80646c0f7f0c5225e88e78859.tar.xz | |
[ptxd_make_world_common] always use <PKG>_BUILD_OOT when set
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_world_common.sh')
| -rw-r--r-- | scripts/lib/ptxd_make_world_common.sh | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index f2a2e1045..8e7bbdaa5 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -274,21 +274,16 @@ ptxd_make_world_init() { # build dir # if [ -z "${pkg_build_dir}" ]; then - case "${pkg_conf_tool}" in - cmake) # cmake based pkg -> _always_ out of tree - pkg_build_dir="${pkg_dir}-build" - ;; - autoconf) # autotoolizied pkg - case "${pkg_build_oot}" in - "YES") pkg_build_dir="${pkg_dir}-build" ;; - "NO") pkg_build_dir="${pkg_conf_dir}" ;; - "") pkg_build_dir="${pkg_conf_dir}" ;; - *) ptxd_bailout "<PKG>_BUILD_OOT: please set to YES or NO" ;; - esac - ;; - *) # qmake or std pkg - pkg_build_dir="${pkg_conf_dir}" - ;; + if [ -z "${pkg_build_oot}" ]; then + case "${pkg_conf_tool}" in + cmake) pkg_build_oot=YES ;; + *) pkg_build_oot=NO ;; + esac + fi + case "${pkg_build_oot}" in + "YES") pkg_build_dir="${pkg_dir}-build" ;; + "NO") pkg_build_dir="${pkg_conf_dir}" ;; + *) ptxd_bailout "<PKG>_BUILD_OOT: please set to YES or NO" ;; esac fi |