diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-08 12:31:46 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-10 15:35:07 +0100 |
| commit | 238d3b1144c82073b74195689ef2ebff3655b6a1 (patch) | |
| tree | d1540bf2fc322b13b0ae77c0714be702a43dfaa3 /scripts/lib/ptxd_make_world_common.sh | |
| parent | 656ed176fa29a475689eb94bc5c1197de306fa58 (diff) | |
| download | ptxdist-238d3b1144c82073b74195689ef2ebff3655b6a1.tar.gz ptxdist-238d3b1144c82073b74195689ef2ebff3655b6a1.tar.xz | |
[ptxd_make_world_common] use <PKG>_CONF_ENV 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 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index ea94ddd93..84f489100 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -63,13 +63,14 @@ ptxd_make_world_init_compat() { # env - if [ -n "${pkg_deprecated_env}" -a \ - \( -n "${pkg_conf_env}" -o -n "${pkg_make_env}" \) ]; then - ptxd_bailout "${FUNCNAME}: <PKG>_ENV is incompatibel with <PKG>_CONF_ENV or <PKG>_MAKE_ENV" + if [ -n "${pkg_deprecated_env}" ]; then + if [ -n "${pkg_conf_env}" -o -n "${pkg_make_env}" ]; then + ptxd_bailout "${FUNCNAME}: <PKG>_ENV is incompatibel with <PKG>_CONF_ENV or <PKG>_MAKE_ENV" + fi + pkg_conf_env="${pkg_deprecated_env}" + pkg_cmake_env="${pkg_deprecated_env}" + pkg_install_env="${pkg_deprecated_env}" fi - pkg_conf_env="${pkg_deprecated_env}" - pkg_cmake_env="${pkg_deprecated_env}" - pkg_install_env="${pkg_deprecated_env}" # autoconf |