4 files changed, 28 insertions, 4 deletions
diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up
index 98fb546dd626..54dd1f3822ca 100755
--- a/bin/distro-install-clean-up
+++ b/bin/distro-install-clean-up
@@ -1,6 +1,12 @@
 #!/bin/sh
 
-. ./*[Ee]nv.[Hh]ost.sh
+if test -z "${SRC_ROOT}"; then
+    eval $(sed -e s/\'/\'\\\\\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ ./config_host.mk)
+fi
+if test -z "${SOLARENV}"; then
+    echo "distro-install-clean-up: No environment set!"
+    exit 1
+fi
 
 echo "Cleaning up ...";
 
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 6e4528595d6e..c7f58ee3ccd5 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -1,6 +1,12 @@
 #!/bin/sh
 
-. ./*[Ee]nv.[Hh]ost.sh
+if test -z "${SRC_ROOT}"; then
+    eval $(sed -e s/\'/\'\\\\\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ ./config_host.mk)
+fi
+if test -z "${SOLARENV}"; then
+    echo "distro-install-clean-up: No environment set!"
+    exit 1
+fi
 
 PRODUCTVERSION_NODOT=`echo $PRODUCTVERSION | sed -e "s/\.//"`
 
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 7282a67a927b..0f6e60ae1281 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -1,6 +1,12 @@
 #!/bin/sh
 
-. ./*[Ee]nv.[Hh]ost.sh
+if test -z "${SRC_ROOT}"; then
+    eval $(sed -e s/\'/\'\\\\\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ ./config_host.mk)
+fi
+if test -z "${SOLARENV}"; then
+    echo "distro-install-clean-up: No environment set!"
+    exit 1
+fi
 
 BUILDDIR=`pwd`
 FILELISTSDIR="$BUILDDIR/file-lists"
diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index 09c75c66f06b..f1cb6fe39e11 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -1,6 +1,12 @@
 #!/bin/sh
 
-. ./*[Ee]nv.[Hh]ost.sh
+if test -z "${SRC_ROOT}"; then
+    eval $(sed -e s/\'/\'\\\\\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ ./config_host.mk)
+fi
+if test -z "${SOLARENV}"; then
+    echo "distro-install-clean-up: No environment set!"
+    exit 1
+fi
 
 if test -d $DESTDIR$INSTALLDIR/sdk ; then