diff --git a/common/build-style/scons.sh b/common/build-style/scons.sh index 17527d7ac65..f87c0dcc530 100644 --- a/common/build-style/scons.sh +++ b/common/build-style/scons.sh @@ -9,18 +9,27 @@ do_build() { CXXFLAGS="$CXXFLAGS" LINKFLAGS="$LDFLAGS" \ cxxflags="$CXXFLAGS" linkflags="$LDFLAGS" \ RANLIB="$RANLIB" ranlib="$RANLIB" \ - prefix=/usr destdir=${DESTDIR} DESTDIR=${DESTDIR} \ + prefix=/usr \ + ${scons_use_destdir:+DESTDIR="${DESTDIR}"} \ + ${scons_use_destdir:+destdir="${DESTDIR}"} \ ${make_build_args} ${make_build_target} } do_install() { : ${make_cmd:=scons} : ${make_install_target:=install} + local _sandbox= + + if [ -z "$scons_use_destdir" ]; then _sandbox=yes ; fi + ${make_cmd} ${makejobs} CC=$CC CXX=$CXX CCFLAGS="$CFLAGS" \ cc=$CC cxx=$CXX ccflags="$CFLAGS" \ CXXFLAGS="$CXXFLAGS" LINKFLAGS="$LDFLAGS" \ cxxflags="$CXXFLAGS" linkflags="$LDFLAGS" \ RANLIB="$RANLIB" ranlib="$RANLIB" \ - prefix=/usr destdir=${DESTDIR} DESTDIR=${DESTDIR} \ + prefix=/usr \ + ${scons_use_destdir:+DESTDIR="${DESTDIR}"} \ + ${scons_use_destdir:+destdir="${DESTDIR}"} \ + ${_sandbox:+--install-sandbox="${DESTDIR}"} \ ${make_install_args} ${make_install_target} }