Changeset 2517 for trunk/scons

Timestamp:

05/15/12 15:17:10 (12 years ago)

Author:

Malte Marquarding

Message:

More updates to get a distutils/scons build going

Location:

trunk/scons

Files:

• casaoptions.py (deleted)
• utils.py (modified) (3 diffs)

trunk/scons/utils.py

@@ -4 +4 @@
 import re
 import platform
+
+def get_libdir():
+    import distutils.sysconfig
+    return os.path.basename(distutils.sysconfig.get_config_var('LIBDIR'))
+
+LIBDIR = "lib" #get_libdir()
 
 def generate(env):
@@ -33 +39 @@
             env.Exit(1)
         env.PrependUnique(CPPPATH = [os.path.join(path, "include")])
-        env.PrependUnique(LIBPATH = [os.path.join(path, "lib")])
+        env.PrependUnique(LIBPATH = [os.path.join(path, LIBDIR)])
     env.AddCustomPath = AddCustomPath
 
@@ -46 +52 @@
         if pkgroot is not None:
             incd = os.path.join(pkgroot, "include")
-            libd = os.path.join(pkgroot, "lib")
+            libd = os.path.join(pkgroot, LIBDIR)
         else:       
             if pkgincd is not None: