From 4340e9a60533c62d2a6948869d29d4e4d79cce25 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 27 Jul 2012 10:56:24 -0700 Subject: [PATCH] scons: fixup LIBDIR value settings - closes #1349 --- SConstruct | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index 2b0f716e71..a46916c9e6 100644 --- a/SConstruct +++ b/SConstruct @@ -32,6 +32,10 @@ try: except: HAS_DISTUTILS = False +if platform.uname()[4] == 'ppc64': + LIBDIR_SCHEMA='lib64' +else: + LIBDIR_SCHEMA='lib' py3 = None @@ -237,14 +241,6 @@ def sort_paths(items,priority): new.extend(v) return new -if platform.dist()[0] in ('Ubuntu','debian'): - LIBDIR_SCHEMA='lib' -elif platform.uname()[4] == 'ppc64': - LIBDIR_SCHEMA='lib64' -else: - LIBDIR_SCHEMA='lib' - - def pretty_dep(dep): pretty = pretty_dep_names.get(dep) if pretty: