Changeset 4518 for branches/1.3


Ignore:
Timestamp:
Jul 16, 2014 6:55:24 PM (6 years ago)
Author:
gah
Message:

fix vtk tcl path

Location:
branches/1.3/gui/apps
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3/gui/apps/rappture-csh.env.in

    r4513 r4518  
    2121set bindir=@bindir@
    2222set libdir=@libdir@
    23 set vtk_tcl_dir=@VTK_TCL_DIR@
    2423set python_version=@PYTHON_VERSION@
    2524set tcl_version=@TCL_VERSION@
     
    8988
    9089if ( $?TCLLIBPATH ) then
    91   setenv TCLLIBPATH "${vtk_tcl_dir} $TCLLIBPATH"
     90  setenv TCLLIBPATH "${libdir}/tcltk/vtk $TCLLIBPATH"
    9291else
    93   setenv TCLLIBPATH "${vtk_tcl_dir}"
     92  setenv TCLLIBPATH "${libdir}/tcltk/vtk"
    9493endif
    9594
  • branches/1.3/gui/apps/rappture.env.in

    r4513 r4518  
    2020libdir=@libdir@
    2121bindir=@bindir@
    22 vtk_tcl_dir=@VTK_TCL_DIR@
    2322python_version=@PYTHON_VERSION@
    2423tcl_version=@TCL_VERSION@
     
    4746export PERL5LIB RUBYLIB PYTHONPATH
    4847
    49 TCLLIBPATH="${vtk_tcl_dir} $TCLLIBPATH"
     48TCLLIBPATH="${libdir}/tcltk/vtk $TCLLIBPATH"
    5049TCL_LIBRARY=${libdir}/tcl${tcl_version}:$TCL_LIBRARY
    5150TK_LIBRARY=${libdir}/tk${tcl_version}:$TK_LIBRARY
  • branches/1.3/gui/apps/rappture.use.in

    r4513 r4518  
    1111libdir=@libdir@
    1212bindir=@bindir@
    13 vtk_tcl_dir=@VTK_TCL_DIR@
    1413python_version=@PYTHON_VERSION@
    1514tcl_version=@TCL_VERSION@
     
    2928prepend PYTHONPATH ${libdir}/python${python_version}/site-packages
    3029
    31 prepend TCLLIBPATH ${vtk_tcl_dir}
     30prepend TCLLIBPATH ${libdir}/tcltk/vtk
    3231prepend TCL_LIBRARY ${libdir}/tcl${tcl_version}
    3332prepend TK_LIBRARY ${libdir}/tk${tcl_version}
Note: See TracChangeset for help on using the changeset viewer.