Drop the need for exporting TCLLIBPATH, use system path

Signed-off-by: Alec Ari <neotheuser@ymail.com>

Author: NTULINUX

.github/scripts/install-deps.sh

@@ -4,6 +4,6 @@ set -eu #Needed so CI fails when anything is wrong
 set -x
 
 sudo apt-get --quiet update
-sudo apt-get install --yes --no-install-recommends devscripts equivs build-essential lintian clang
+sudo apt-get install --yes --no-install-recommends devscripts equivs build-essential lintian clang tcl
 debian/configure
 sudo apt-get --yes build-dep .

debian/configure

@@ -152,6 +152,8 @@ KERNEL_DEPENDS_BUILD=libudev-dev
 KERNEL_HEADERS=
 KERNEL_VERSION=uspace
 MODUTILS_DEPENDS=
+TCL_GET_DIR=$(echo 'puts [tcl::pkgconfig get scriptdir,runtime]' | tclsh)
+EMC2_TCL_DIR="${TCL_GET_DIR}/linuxcnc"
 if false; then
 MAIN_PACKAGE_NAME=linuxcnc
 OTHER_MAIN_PACKAGE_NAME=linuxcnc-uspace
@@ -177,6 +179,7 @@ sed \
     -e "s#@KERNEL_HEADERS@#$KERNEL_HEADERS#g" \
     -e "s#@KERNEL_VERSION@#$KERNEL_VERSION#g" \
     -e "s#@LIBREADLINE_DEV@#$LIBREADLINE_DEV#g" \
+    -e "s#@EMC2_TCL_DIR@#$EMC2_TCL_DIR#g" \
     -e "s#@MAIN_PACKAGE_NAME@#$MAIN_PACKAGE_NAME#g" \
     -e "s#@MODULE_EXT@#$MODULE_EXT#g" \
     -e "s#@MODULE_PATH@#$MODULE_PATH#g" \

debian/linuxcnc.install.in

@@ -113,7 +113,7 @@ usr/bin/xyzbc-trt-gui
 usr/lib/lib*.so.*
 usr/lib/linuxcnc
 usr/lib/python3
-usr/lib/tcltk
+.@EMC2_TCL_DIR@
 
 usr/share/axis
 usr/share/glade

debian/rules.in

@@ -145,8 +145,8 @@ override_dh_compress:
 override_dh_fixperms:
 	dh_fixperms -X/linuxcnc_module_helper -X/rtapi_app
 	# In case that only the indep packages are built
-	if [ -x  "$(DESTDIR)/usr/lib/tcltk/linuxcnc/linuxcnc.tcl" ]; then \
-		chmod -x $(DESTDIR)/usr/lib/tcltk/linuxcnc/linuxcnc.tcl; \
+	if [ -x  "$(DESTDIR)@EMC2_TCL_DIR@/linuxcnc.tcl" ]; then \
+		chmod -x $(DESTDIR)@EMC2_TCL_DIR@/linuxcnc.tcl; \
 	fi
 	# override_dh_python3: # not executed, so we attach it to fixperms
 	DEB_HOST_ARCH=`dpkg-architecture -qDEB_HOST_ARCH` dh_python3

lib/python/.gitignore

@@ -4,3 +4,4 @@ gmoccapy/
 stepconf/
 pncconf/
 pyui/
+rs274/options.py

lib/python/rs274/options.py lib/python/rs274/options.py.inlib/python/rs274/options.py renamed to lib/python/rs274/options.py.in

@@ -18,11 +18,13 @@
 
 import nf, os
 
-# lib/tcltk/emc2 for installed emc
-# tcl            for run-in-place emc
-for candidate in 'lib/tcltk/linuxcnc', 'tcl':
-    LINUXCNC_TCL = os.path.join(nf.PREFIX, candidate, 'linuxcnc.tcl')
-    if os.path.exists(LINUXCNC_TCL): break
+# System Tcl directory for installed emc
+# tcl                  for run-in-place emc
+rip_tcl_path = os.path.join(nf.PREFIX, 'tcl', 'linuxcnc.tcl')
+if os.path.exists(rip_tcl_path):
+    LINUXCNC_TCL = rip_tcl_path
+else:
+    LINUXCNC_TCL = os.path.join("@EMC2_TCL_DIR@", "linuxcnc.tcl")
 
 options = '''
 . configure -bg #d9d9d9

src/Makefile.inc.in

@@ -66,7 +66,7 @@ LANGUAGES = @LANGUAGES@
 docsdir = ${prefix}/share/doc/linuxcnc
 sampleconfsdir = ${prefix}/share/doc/linuxcnc/examples/sample-configs
 ncfilesdir = ${prefix}/share/linuxcnc/ncfiles
-tcldir = ${prefix}/lib/tcltk/linuxcnc
+tcldir = @EMC2_TCL_DIR@
 
 
 # /Standard configure directories

src/configure.ac

@@ -726,9 +726,10 @@ else
     EMC2_SCRIPT=$EMC2_BIN_DIR/linuxcnc
     EMC2_SUFFIX=""
     EMC2_ICON=linuxcncicon
-    EMC2_TCL_DIR=${prefix}/lib/tcltk/linuxcnc
-    EMC2_TCL_LIB_DIR=${prefix}/lib/tcltk/linuxcnc
-    EMC2_LANG_DIR=${prefix}/lib/tcltk/linuxcnc/msgs
+    TCL_GET_DIR=$(echo 'puts [[tcl::pkgconfig get scriptdir,runtime]]' | tclsh)
+    EMC2_TCL_DIR="${TCL_GET_DIR}/linuxcnc"
+    EMC2_TCL_LIB_DIR="${EMC2_TCL_DIR}"
+    EMC2_LANG_DIR="${EMC2_TCL_DIR}/msgs"
     EMC2_PO_DIR=${prefix}/share/locale
     EMC2_HELP_DIR=${prefix}/share/doc/linuxcnc
     case $MODULE_DIR in
@@ -1758,6 +1759,7 @@ AC_CONFIG_FILES(Makefile.inc)
 AC_CONFIG_FILES(Makefile.modinc)
 AC_CONFIG_FILES(../tcl/linuxcnc.tcl)
 AC_CONFIG_FILES(../lib/python/nf.py)
+AC_CONFIG_FILES(../lib/python/rs274/options.py)
 AC_CONFIG_FILES([../scripts/linuxcncmkdesktop], [chmod +x ../scripts/linuxcncmkdesktop])
 AC_CONFIG_FILES(../share/applications/linuxcnc-latency.desktop)
 AC_CONFIG_FILES(../share/applications/linuxcnc-latency-histogram.desktop)