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

[Alexander Dreyer]

The following commit has been merged in the master branch:
commit 2dc00808d326eb44cd2c0d6e28c969866ed27c1e
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Mon Jan 28 02:09:45 2013 +0100

    Ensure ipbori2.x and PolyGUI2.x access the desired modules
    ---
     SConstruct |   26 +++++++++++++-------------
     1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/SConstruct b/SConstruct
index fe50e9a..41c9a54 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1902,17 +1902,17 @@ if 'install' in COMMAND_LINE_TARGETS or 'install-docs' in COMMAND_LINE_TARGETS:
                                      '$PYINSTALLPREFIX')
     
     for instfile in [ IPBPath('ipbori')]:
-        FinalizeExecs(env.SubstInstallAs(InstPath(instfile), instfile))
+        FinalizeExecs(env.SubstInstallAs(InstPath(instfile + pyconf.version), instfile))
 
     for instfile in [ GUIPath('PolyGUI') ]:
-        FinalizeExecs(env.SubstInstallAs(InstPath(instfile), instfile))
+        FinalizeExecs(env.SubstInstallAs(InstPath(instfile + pyconf.version), instfile))
 
     for instfile in [GUIPath('cnf2ideal.py')]:
         pyfiles += env.InstallAs(InstPath(instfile), instfile)
         
     for instfile in [ GUIPath('polybori.png') ]:
         env.InstallAs(InstPath(instfile), instfile)
-    
+
     # Copy c++ documentation
     if HAVE_DOXYGEN:
         cxxdocinst = env.CopyAll(env.Dir(InstDocPath('c++')),
@@ -1991,20 +1991,20 @@ if 'install' in COMMAND_LINE_TARGETS or 'install-docs' in COMMAND_LINE_TARGETS:
                                           '$PYINSTALLPREFIX')       
 
     # Symlink from executable into bin directory
-    ipboribin = env.SymLink(InstExecPath('ipbori'),
-                            InstPath(IPBPath('ipbori'))) + \
+    ipboribin = env.SymLink(InstExecPath('ipbori' + pyconf.version),
+                            InstPath(IPBPath('ipbori' + pyconf.version))) + \
     env.SymLink(InstExecPath('ipbori' + pyconf.major),
-                InstExecPath('ipbori')) + \
-    env.SymLink(InstExecPath('ipbori' + pyconf.version),
-                InstExecPath('ipbori'))
+                InstExecPath('ipbori' + pyconf.version)) + \
+    env.SymLink(InstExecPath('ipbori'),
+                InstExecPath('ipbori' + pyconf.version))
 
 
-    guibin = env.SymLink(InstExecPath('PolyGUI'),
-                         InstPath(GUIPath('PolyGUI'))) + \
+    guibin = env.SymLink(InstExecPath('PolyGUI' + pyconf.version),
+                         InstPath(GUIPath('PolyGUI' + pyconf.version))) + \
     env.SymLink(InstExecPath('PolyGUI' + pyconf.major),
-                InstExecPath('PolyGUI')) + \
-    env.SymLink(InstExecPath('PolyGUI' + pyconf.version),
-                InstExecPath('PolyGUI'))
+                InstExecPath('PolyGUI' + pyconf.version)) + \
+    env.SymLink(InstExecPath('PolyGUI'),
+                InstExecPath('PolyGUI' + pyconf.version))
     
     env.AlwaysBuild(ipboribin)   
     env.Alias('install', ipboribin)

-- 
polybori: Polynomials over Boolean Rings