search for macros in target dependent paths

When adbd48158b261b replaced macrofiles list to have proper order of
loading, it also hardcoded in it the architecture on which rpm was
build.  Reverse that part of the change so the search paths for macros
depend again on --target argument.

diff --git a/rpm.spec b/rpm.spec
index b968f84dcd6cd0f09b29723c239c2be1739bbb75..fea91ef722297e8a770202f61ea8a37b0a1911a1 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -1024,7 +1024,7 @@ sed -i \
        --with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \
        --with-lzma=external \
        --with-neon=%{?with_neon:external}%{!?with_neon:no} \
-       --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/%{_target}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \
+       --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \
        --without-path-versioned \
        --with-pcre=external \
        --with-popt=external \