Changeset 4522 for branches/1.3/gui/apps/rappture.env.in

Timestamp:

Jul 17, 2014, 12:10:30 AM (10 years ago)

Author:

ldelgass

Message:

Revert 4518 and pull in the changes to top level configure from trunk to
fix VTK directories for gui/src/Makefile and TCLLIBPATH in gui/apps

File:

• branches/1.3/gui/apps/rappture.env.in (modified) (2 diffs)

branches/1.3/gui/apps/rappture.env.in

@@ -20 +20 @@
 libdir=@libdir@
 bindir=@bindir@
+vtk_tcl_dir=@VTK_TCL_DIR@
 python_version=@PYTHON_VERSION@
 tcl_version=@TCL_VERSION@
@@ -46 +47 @@
 export PERL5LIB RUBYLIB PYTHONPATH
 
-TCLLIBPATH="${libdir}/tcltk/vtk $TCLLIBPATH"
+TCLLIBPATH="${vtk_tcl_dir} $TCLLIBPATH"
 TCL_LIBRARY=${libdir}/tcl${tcl_version}:$TCL_LIBRARY
 TK_LIBRARY=${libdir}/tk${tcl_version}:$TK_LIBRARY