[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-140-ge61fdaa

Alexander Dreyer adreyer at gmx.de
Tue Jan 22 23:24:27 UTC 2013


The following commit has been merged in the master branch:
commit 6ff0e27f0ef7ea4f9578b41e78d7775401659d4d
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Tue Jan 22 15:19:20 2013 +0100

    same for docs

diff --git a/SConstruct b/SConstruct
index 5d11c47..4708b8c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1707,11 +1707,16 @@ if have_l2h or have_t4h or HAVE_DOXYGEN:
             tutorial = env.TeXToHt(env.Dir(DocPath('tutorial/tutorial')),
                                    tutorial_srcs)    
 
-    documastersubdirs = ["tutorial/tutorial", "c++"] + [
-        path.basename(elt) for elt in glob(DocPath("python*"))]
-    
-    if docpybase not in documastersubdirs:
-        documastersubdirs += [docpybase]
+    documastersubdirs = []
+    if have_l2h or have_t4h:
+        documastersubdirs += ["tutorial/tutorial"]
+    if HAVE_DOXYGEN:
+        documastersubdirs += ["c++"]
+
+    if have_pydoc and HAVE_PYTHON_EXTENSION:
+        documastersubdirs += [path.basename(elt) for elt in glob(DocPath("python*"))]
+        if docpybase not in documastersubdirs:
+            documastersubdirs += [docpybase]
 
     docmstr = env.DocuMaster(DocPath('index.html'),
                              [DocPath('index.html.in')] + [
@@ -2066,10 +2071,11 @@ Type=Application
         env.Depends('install-docs', 'prepare-docs')
         env.Alias('install', 'install-docs')
 
-
 env.Alias('prepare-static',  stlibs)
-env.Alias('prepare-install',
-          dylibs + readabledevellibs + [DocPath()])
+env.Alias('prepare-install', dylibs + readabledevellibs)
+
+if have_l2h or have_t4h or  HAVE_DOXYGEN or have_pydoc:
+    env.Alias('prepare-install', [DocPath()])
 
 if HAVE_PYTHON_EXTENSION:
     env.Alias('prepare-install', [BuildPyPBPath(), pyroot])
@@ -2077,7 +2083,6 @@ if HAVE_PYTHON_EXTENSION:
 env.Alias('prepare-devel',  ['prepare-static', 'prepare-install'])
 
 
-
 for sfx in [pyconf.major, pyconf.version]:
     Default(env.SymLink(IPBPath('ipbori' + sfx),
                         IPBPath('ipbori')))

-- 
polybori: Polynomials over Boolean Rings



More information about the debian-science-commits mailing list