[SCM] polybori: Polynomials over Boolean Rings branch, upstream-hg, updated. b4a5cffaa908c53e1d958a42110f8c4dad853aa3

Alexander Dreyer adreyer at gmx.de
Fri Mar 23 08:02:20 UTC 2012


The following commit has been merged in the upstream-hg branch:
commit feadc529c69b798a6daed29029d5a847c95c46cd
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Wed Mar 7 23:35:03 2012 +0100

    FIX: build works without python extension

diff --git a/SConstruct b/SConstruct
index 9b5fea6..ff4273b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1568,12 +1568,7 @@ if 'install' in COMMAND_LINE_TARGETS:
                 env.AddPostAction(elt, 
                                   "install_name_tool -id " + name + " $TARGET")
 
-        if HAVE_PYTHON_EXTENSION:
-            pypb_inst = env.Install(InstPyPath("polybori/dynamic"), pypb)
-            env.Depends(pypb_inst, dylibs_inst + dylibs_readable_inst)
-            so_pyfiles += pypb_inst
-
-    else:
+    if HAVE_PYTHON_EXTENSION:
         pypb_inst = env.Install(InstPyPath("polybori/dynamic"), pypb)
         env.Depends(pypb_inst, dylibs_inst + dylibs_readable_inst)
         so_pyfiles += pypb_inst
@@ -1636,7 +1631,8 @@ if 'install' in COMMAND_LINE_TARGETS:
         targetfile = InstPyPath(env.relpath(PyRootPath(), instfile))
         pyfiles += env.InstallAs(targetfile, instfile)
 
-    pyfiles +=  env.Install(InstPyPath("polybori/dynamic"), pypb_init_py)
+    if HAVE_PYTHON_EXTENSION:
+        pyfiles +=  env.Install(InstPyPath("polybori/dynamic"), pypb_init_py)
 
     if HAVE_PYTHON_EXTENSION or extern_python_ext:
         cmdline = """$PYTHON -c "import compileall; compileall.compile_dir('"""

-- 
polybori: Polynomials over Boolean Rings



More information about the debian-science-commits mailing list