sat #33094: add TCL_LIBRARY and TK_LIBRARY environment variables

diff --git a/products/env_scripts/tcl.py b/products/env_scripts/tcl.py
index cb41c24efc489368bde52614f61dfd8e212101da..f4bbe16c4bb7f45283b7c714c5c63bf3547855d2 100644 (file)
--- a/products/env_scripts/tcl.py
+++ b/products/env_scripts/tcl.py
@@ -18,6 +18,7 @@ def set_env(env, prereq_dir, version):
     #http://computer-programming-forum.com/57-tcl/1dfddc136afccb94.htm
     #Tcl treats the contents of that variable as a list. Be happy, for you can now use drive letters on windows.
     env.prepend('TCLLIBPATH', l, sep=" ")
+    env.set('TCL_LIBRARY',os.path.join(prereq_dir, 'lib', 'tcl' + env.get('TCL_SHORT_VERSION')))
 
     if not platform.system() == "Windows" :
         env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib'))

diff --git a/products/env_scripts/tcltk.py b/products/env_scripts/tcltk.py
index bab12780ee0259933b4e6c6c336bbd91853e29f4..b86c32081ef0baa764a7f426171e393bd74812e7 100644 (file)
--- a/products/env_scripts/tcltk.py
+++ b/products/env_scripts/tcltk.py
@@ -24,6 +24,8 @@ def set_env(env, prereq_dir, version):
   l.append(os.path.join(prereq_dir, 'lib'))
   l.append(os.path.join(prereq_dir, 'lib', 'tk' + env.get('TCL_SHORT_VERSION')))
   env.prepend('TKLIBPATH', l, sep=" ")
+  env.set('TCL_LIBRARY',os.path.join(prereq_dir, 'lib', 'tcl' + env.get('TCL_SHORT_VERSION')))
+  env.set('TK_LIBRARY', os.path.join(prereq_dir, 'lib', 'tk'  + env.get('TCL_SHORT_VERSION')))
 
   if not platform.system() == "Windows" :
     env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib'))

diff --git a/products/env_scripts/tk.py b/products/env_scripts/tk.py
index 91571d731cdd6d69d4001e7968ec2934170280c3..d0d36ace27ac85035f00064ce7cffdb757ba1ff2 100755 (executable)
--- a/products/env_scripts/tk.py
+++ b/products/env_scripts/tk.py
@@ -20,6 +20,7 @@ def set_env(env, prereq_dir, version):
     #http://computer-programming-forum.com/57-tcl/1dfddc136afccb94.htm
     #Tcl treats the contents of that variable as a list. Be happy, for you can now use drive letters on windows.
     env.prepend('TKLIBPATH', l, sep=" ")
+    env.set('TK_LIBRARY',os.path.join(prereq_dir, 'lib', 'tk' + env.get('TCL_SHORT_VERSION')))
 
     if not platform.system() == "Windows" :
         env.prepend('LD_LIBRARY_PATH', os.path.join(root, 'lib'))