1 files changed, 10 insertions, 3 deletions
diff --git a/g b/g
index 288489cfd2f8..711318b11913 100755
--- a/g
+++ b/g
@@ -10,9 +10,16 @@ fi
 SUBMODULES_ALL="dictionaries helpcontent2 translations"
 
 pushd $(dirname $0) > /dev/null
-COREDIR=$(pwd)
+if [ -f config_host.mk ] ; then
+    # we are in the BUILD_DIR
+    SRC_ROOT=$(cat ${BUILD_DIR}/config_host.mk | grep SRC_ROOT | sed -e "s/.*=//")
+else
+    SRC_ROOT=$(pwd)
+fi
 popd > /dev/null
 
+COREDIR="$SRC_ROOT"
+
 usage()
 {
     git
@@ -114,8 +121,8 @@ local repo
 get_configured_submodules()
 {
     SUBMODULES_CONFIGURED=""
-    if [ -f "config_host.mk" ] ; then
-	SUBMODULES_CONFIGURED=$(cat config_host.mk | grep GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
+    if [ -f "${BUILD_DIR}/config_host.mk" ] ; then
+	SUBMODULES_CONFIGURED=$(cat ${BUILD_DIR}/config_host.mk | grep GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
     else
 	# if we need the configured submoduel before the configuration is done. we assumed you want them all
 	SUBMODULES_CONFIGURED=${SUBMODULES_ALL?}