]> granicus.if.org Git - sudo/commitdiff
For SuSE, only use /usr/lib64 as libexec if generating 64-bit
authorTodd C. Miller <Todd.Miller@courtesan.com>
Sat, 13 Aug 2011 17:34:54 +0000 (13:34 -0400)
committerTodd C. Miller <Todd.Miller@courtesan.com>
Sat, 13 Aug 2011 17:34:54 +0000 (13:34 -0400)
binaries.

--HG--
branch : 1.7

mkpkg

diff --git a/mkpkg b/mkpkg
index 019f59a8b428b1ea3feb7ee508e1d728466c59cf..86a65b99295740649d6ec226533ffde908a5649c 100755 (executable)
--- a/mkpkg
+++ b/mkpkg
@@ -155,9 +155,10 @@ case "$osversion" in
            fi
        fi
        # SuSE doesn't have /usr/libexec
+       libexec=lib
        case "$osversion" in
-           *64*)       libexec=lib64;;
-           *)          libexec=lib;;
+           *64*)       gcc -v 2>&1 | grep "with-cpu=[^ ]*32" >/dev/null || libexec=lib64
+                       ;;
        esac
        # Note, must indent with tabs, not spaces due to IFS trickery
        # XXX - SuSE uses secure path but only for env_reset