3.115-wrapper-r1.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  1. diff --git a/bin/sparky b/bin/sparky
  2. index 8b51212..270723a 100644
  3. --- a/bin/sparky
  4. +++ b/bin/sparky
  5. @@ -4,18 +4,6 @@
  6. #
  7. # -----------------------------------------------------------------------------
  8. -# Figure out Sparky installation directory from $0.
  9. -#
  10. -set sparky_exe = "$0"
  11. -while (-l "$sparky_exe")
  12. - set ls_sparky_exe = `ls -l "$sparky_exe"`
  13. - set sparky_exe = `echo "$ls_sparky_exe" | sed 's/.* -> //'`
  14. -end
  15. -set sparky_bin = `dirname "$sparky_exe"`
  16. -set sparky_bin = `cd "$sparky_bin"; pwd`
  17. -set sparky_inst = `dirname "$sparky_bin"`
  18. -
  19. -# -----------------------------------------------------------------------------
  20. # Sparky uses the SPARKY_INSTALL environment variable to find its
  21. # application resource file and print prolog file.
  22. #
  23. @@ -25,7 +13,7 @@ setenv SPARKY_INSTALL "$sparky_inst"
  24. # If Python is available start Sparky as a Python extension.
  25. # Otherwise the standalone version of Sparky is started.
  26. #
  27. -set PYTHON = "$SPARKY_INSTALL/python2.5/bin/python2.5"
  28. +set PYTHON = GENTOO_PYTHON
  29. if (! -e "$PYTHON") then
  30. set PYTHON = python2.5
  31. endif
  32. @@ -79,7 +67,7 @@ if ($status == 0) then
  33. # ---------------------------------------------------------------------------
  34. # Add the Sparky package and Tkinter to the Python path
  35. #
  36. - set SPARKY_PYTHONPATH = "$SPARKY_INSTALL/python:$SPARKY_INSTALL/python/lib-tk"
  37. + set SPARKY_PYTHONPATH = "$SPARKY_INSTALL/python:$SPARKY_INSTALL/python/sparky"
  38. if ($?PYTHONPATH) then
  39. setenv PYTHONPATH "${SPARKY_PYTHONPATH}:$PYTHONPATH"
  40. else