[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     131a48fda39fb846922d0e521695b5e5a77f4fb4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  5 13:46:44 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 13:46:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=131a48fd

scripts/bootstrap-prefix: use MAKE_CONF_DIR where possible

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e372fb21da..04a6ef37b1 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -310,7 +310,7 @@ bootstrap_setup() {
        rm "${ROOT}"/FOO.$$
 
        [[ ! -e "${MAKE_CONF_DIR}" ]] && mkdir -p -- "${MAKE_CONF_DIR}"
-       if [[ ! -f 
${ROOT}/etc/portage/make.conf/0100_bootstrap_prefix_make.conf ]] ; then
+       if [[ ! -f ${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf ]] ; then
                {
                        echo "# Added by bootstrap-prefix.sh for ${CHOST}"
                        echo 'USE="unicode nls"'
@@ -1649,7 +1649,7 @@ do_emerge_pkgs() {
                        internal-glib
                )
                local override_make_conf_dir=\
-                       "${PORTAGE_OVERRIDE_EPREFIX}/etc/portage/make.conf/"
+                       "${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#${ROOT}}"
 
                if [[ " ${USE} " == *" prefix-stack "* ]] &&
                   [[ ${PORTAGE_OVERRIDE_EPREFIX} == */tmp ]] &&