get install-time vars from objdir

diff --git a/build-rr.sh b/build-rr.sh
index 364d7d8a64061f4ae72b99f5c5f0c8d87a530ade..d9608bafa6479429775a071ac7c40d2052e38b4b 100755 (executable)
--- a/build-rr.sh
+++ b/build-rr.sh
@@ -390,6 +390,8 @@ makeconfig ()
 dobuild ()
 {
 
+       setvars "$@"
+
        checksubmodules
 
        . ${BUILDRUMP}/subr.sh
@@ -421,9 +423,12 @@ doinstall ()
 {
 
        # sanity check
-       [ -d "${STAGING}" ] \
+       [ -d "${RROBJ}" ] \
            || die 'No objdir. No build or build with different params?'
 
+       . "${RROBJ}/config.sh"
+       STAGING="${RROBJ}/dest.stage"
+
        # default used to be a symlink, so this is for "compat".
        # remove in a few months.
        rm -f ${RRDEST} > /dev/null 2>&1 || true
@@ -463,7 +468,6 @@ doinstall ()
 parseargs "$@"
 shift ${ARGSSHIFT}
 
-setvars "$@"
 ${DObuild} && dobuild "$@"
 ${DOinstall} && doinstall