diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-03 10:03:25 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-04 10:29:32 +0100 |
| commit | 80af1db494af9792b621cf872219087d011b5ca9 (patch) | |
| tree | 6e8a7564e902b5491868a59c6de50deeb32c799d /scripts/lib/ptxd_make_world_common.sh | |
| parent | 6eb3ff29de9ffddde6c8846ca9164e50ac9a8610 (diff) | |
| download | ptxdist-80af1db494af9792b621cf872219087d011b5ca9.tar.gz ptxdist-80af1db494af9792b621cf872219087d011b5ca9.tar.xz | |
[ptxd_make_world_init_compat] use <PKG>_MAKE_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 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index 5f744f6be..a78307ed6 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -87,10 +87,12 @@ ptxd_make_world_init_compat() { # compile_env - if [ -n "${pkg_deprecated_compile_env}" -a -n "${pkg_make_env}" ]; then - ptxd_bailout "${FUNCNAME}: <PKG>_COMPILE_ENV is incompatibel with <PKG>_MAKE_ENV" + if [ -n "${pkg_deprecated_compile_env}" ]; then + if [ -n "${pkg_make_env}" ]; then + ptxd_bailout "${FUNCNAME}: <PKG>_COMPILE_ENV is incompatibel with <PKG>_MAKE_ENV" + fi + pkg_make_env="${pkg_deprecated_compile_env}" fi - pkg_make_env="${pkg_deprecated_compile_env}" # makevars |