diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-05-30 21:30:04 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-06-21 11:35:08 +0200 |
| commit | 56d1e77474f54b41eef901bbf49bf789e8a0894e (patch) | |
| tree | 846784679e04aedcefc763cdaafe44ec127ec20f /g | |
| parent | acad0f0c53b788f40b2e8344a1c0fe63333e862e (diff) | |
g: we are not, in fact, in the BUILDDIR
For an out-of-tree build, "make fetch" poinlessly clones all git
submodules.
Change-Id: If4afb218946f49ba934f68b35806fd8143c39387
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135143
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit aa8ef74b475a6fbd6e4ec27c42941aa274998df6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136177
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'g')
| -rwxr-xr-x | g | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -10,9 +10,9 @@ fi SUBMODULES_ALL="dictionaries helpcontent2 translations" pushd $(dirname $0) > /dev/null -if [ -f config_host.mk ] ; then - # we are in the BUILDDIR - SRC_ROOT=$(< config_host.mk grep -a SRC_ROOT | sed -e "s/.*=//") +if [ -f ${BUILDDIR}/config_host.mk ] ; then + # we are in the SRCDIR + SRC_ROOT=$(< ${BUILDDIR}/config_host.mk grep -a SRC_ROOT | sed -e "s/.*=//") else SRC_ROOT=$(pwd) fi @@ -138,8 +138,8 @@ get_active_submodules() get_configured_submodules() { SUBMODULES_CONFIGURED="" - if [ -f config_host.mk ] ; then - SUBMODULES_CONFIGURED=$(< config_host.mk grep -a GIT_NEEDED_SUBMODULES | sed -e "s/.*=//") + if [ -f ${BUILDDIR}/config_host.mk ] ; then + SUBMODULES_CONFIGURED=$(< ${BUILDDIR}/config_host.mk grep -a GIT_NEEDED_SUBMODULES | sed -e "s/.*=//") else # if we need the configured submodule before the configuration is done. we assumed you want them all SUBMODULES_CONFIGURED=${SUBMODULES_ALL?} @@ -149,12 +149,12 @@ get_configured_submodules() get_git_reference() { REFERENCED_GIT="" - if [ -f config_host.mk ]; then - REFERENCED_GIT=$(< config_host.mk grep -a GIT_REFERENCE_SRC | sed -e "s/.*=//") + if [ -f ${BUILDDIR}/config_host.mk ]; then + REFERENCED_GIT=$(< ${BUILDDIR}/config_host.mk grep -a GIT_REFERENCE_SRC | sed -e "s/.*=//") fi LINKED_GIT="" - if [ -f config_host.mk ]; then - LINKED_GIT=$(< config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//") + if [ -f ${BUILDDIR}/config_host.mk ]; then + LINKED_GIT=$(< ${BUILDDIR}/config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//") fi } |