builder --no-init: reset all variables to current dir

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index dfb0867b1701e1effa9bf81364758b239f8a3fd1..b997716e1d7ff7b4014f7c116fa0a089d945558b 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -848,8 +848,10 @@ init_builder() {
                        PACKAGE_DIR=$REPO_DIR/$ASSUMED_NAME
                fi
        else
-               PACKAGE_DIR=$(pwd)
+               TOP_DIR=$(pwd)
+               PACKAGE_DIR=$TOP_DIR
                REPO_DIR=$PACKAGE_DIR
+               RPMBUILDOPTS="$RPMBUILDOPTS --define '_topdir $TOP_DIR' --define '_builddir %_topdir' --define '_rpmdir %_topdir' --define '_srcrpmdir %_topdir'"
        fi
        export GIT_WORK_TREE=$PACKAGE_DIR
        export GIT_DIR=$PACKAGE_DIR/.git