diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-11 16:39:02 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-11 16:39:02 +0100 |
commit | d449869617a3e07aef483437158ca7f634ee7263 (patch) | |
tree | d6023a696de698f5ea17dd2cf965ecbc9c378a51 /g | |
parent | 9e0634736dd4445b10ebbc5ce49d32c1750e6c9d (diff) |
./g cannot reference builddir
Because either it's called from there, and then it's the current directory,
or otherwise the srcdir has no idea where the builddir is (or even how many
of them), and there's nothing to tell it.
Change-Id: I88c5fe8f015cc63a5aa7c327eb82ed751c3e8aa0
Diffstat (limited to 'g')
-rwxr-xr-x | g | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -12,7 +12,7 @@ SUBMODULES_ALL="dictionaries helpcontent2 translations" pushd $(dirname $0) > /dev/null if [ -f config_host.mk ] ; then # we are in the BUILDDIR - SRC_ROOT=$(cat ${BUILDDIR}/config_host.mk | grep SRC_ROOT | sed -e "s/.*=//") + SRC_ROOT=$(cat config_host.mk | grep SRC_ROOT | sed -e "s/.*=//") else SRC_ROOT=$(pwd) fi @@ -121,8 +121,8 @@ local repo get_configured_submodules() { SUBMODULES_CONFIGURED="" - if [ -f "${BUILDDIR}/config_host.mk" ] ; then - SUBMODULES_CONFIGURED=$(cat ${BUILDDIR}/config_host.mk | grep GIT_NEEDED_SUBMODULES | sed -e "s/.*=//") + if [ -f config_host.mk ] ; then + SUBMODULES_CONFIGURED=$(cat 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?} |