Replace hardcoded i386 machine name in dyn_rpm() with the result of `uname -m`.

svn path=/main/trunk/; revision=11195

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 80dd9d724427bf609128bc23de88ffd43a7371df..b27c81e8668320396d10e9c3956f74d96a114500 100755 (executable)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -661,11 +661,13 @@ __END1__
 
 dyn_rpm() {
        cd "${T}" || die "cd failed"
+       local machine_name=$(uname -m)
+       local dest_dir=/usr/src/rpm/RPMS/${machine_name}
        addwrite /usr/src/rpm
        addwrite "${RPMDIR}"
        dyn_spec
        rpmbuild -bb --clean --rmsource "${PF}.spec" || die "Failed to integrate rpm spec file"
-       install -D "/usr/src/rpm/RPMS/i386/${PN}-${PV}-${PR}.i386.rpm" \
+       install -D "${dest_dir}/${PN}-${PV}-${PR}.${machine_name}.rpm" \
                "${RPMDIR}/${CATEGORY}/${PN}-${PV}-${PR}.rpm" || \
                die "Failed to move rpm"
 }