[gentoo-commits] repo/proj/guru:dev commit in: eclass/

[Alessandro Barbieri]

commit:     95b85988993f04b6be454b7ef8effe91aa028320
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun May  8 01:04:45 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun May  8 01:58:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=95b85988

octaveforge.eclass: fix some issues while moving in folders

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 eclass/octaveforge.eclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/octaveforge.eclass b/eclass/octaveforge.eclass
index 67eb8aece..fb708e3a7 100644
--- a/eclass/octaveforge.eclass
+++ b/eclass/octaveforge.eclass
@@ -51,7 +51,6 @@ octaveforge_src_unpack() {
        default
        if [[ ! -d "${WORKDIR}/${P}" ]]; then
                S="${WORKDIR}/${PN}"
-               pushd "${S}" || die
        fi
 }
 
@@ -61,13 +60,15 @@ octaveforge_src_unpack() {
 octaveforge_src_prepare() {
        _generate_configure
 
-       pushd "${S}/src" || die
        if [[ -e "${S}/src/configure.ac" ]]; then
+               pushd "${S}/src" || die
                eautoreconf
+               popd || die
        elif [[ -e "${S}/src/autogen.sh" ]]; then
+               pushd "${S}/src" || die
                 ./autogen.sh || die 'failed to run autogen.sh'
+               popd || die
        fi
-       popd || die
        if [[ -e "${S}/src/Makefile" ]]; then
                sed -i 's/ -s / /g' "${S}/src/Makefile" || die 'sed failed.'
        fi