Changeset 4522 for branches/1.3/gui/apps/rappture-csh.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-csh.env.in (modified) (2 diffs)

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

@@ -21 +21 @@
 set bindir=@bindir@
 set libdir=@libdir@
+set vtk_tcl_dir=@VTK_TCL_DIR@
 set python_version=@PYTHON_VERSION@
 set tcl_version=@TCL_VERSION@
@@ -88 +89 @@
 
 if ( $?TCLLIBPATH ) then
-  setenv TCLLIBPATH "${libdir}/tcltk/vtk $TCLLIBPATH"
+  setenv TCLLIBPATH "${vtk_tcl_dir} $TCLLIBPATH"
 else
-  setenv TCLLIBPATH "${libdir}/tcltk/vtk"
+  setenv TCLLIBPATH "${vtk_tcl_dir}"
 endif