merge suggestions from saengowp

1 files changed, 32 insertions, 0 deletions

diff --git a/01-package-path.patch b/01-package-path.patch
new file mode 100644
index 000000000000..03e17e047070
--- /dev/null
+++ b/01-package-path.patch
@@ -0,0 +1,32 @@
+diff --git a/HP-15C.tcl b/HP-15C.tcl
+old mode 100644
+new mode 100755
+index 50238bb..209392b
+--- a/HP-15C.tcl
++++ b/HP-15C.tcl
+@@ -62,7 +62,7 @@ array set APPDATA {
+ }
+ 
+ set APPDATA(SerialNo) "$APPDATA(build)[string map {. {}} $APPDATA(version)]"
+-set APPDATA(basedir) [file dirname [info script]]
++set APPDATA(basedir) "/usr/lib/hp15c"
+ set APPDATA(locale) [mclocale]
+ 
+ # Load language according to current locale
+@@ -3252,14 +3253,7 @@ proc help { topic } {
+ 
+   switch $topic {
+     simulator {
+-# Differentiate between running from a starpack or from wish
+-      if {[info exists ::starkit::topdir]} {
+-        set helpdir [file dirname $::starkit::topdir]
+-      } else {
+-        set helpdir [file dirname $::argv0]
+-      }
+-      if {[string compare $helpdir "."] == 0} {set helpdir [pwd]}
+-      set helpfile "$helpdir/doc/index.htm"
++      set helpfile "/usr/share/doc/hp15c/index.htm"
+     }
+     prgm {
+       set helpfile "$HP15(prgmdir)/$HP15(prgmname).htm"
+---