Skip to content

Commit 5277e32

Browse files
committed
system-tclpath: fix package build and nf.EMC2_TCL_DIR
- nf.py.in: expose EMC2_TCL_DIR so rs274/options.py can read it (fixes 'module nf has no attribute EMC2_TCL_DIR' at runtime) - control.top.in: build-depend on tcl for /usr/bin/tclsh; src/configure queries tcl_pkgPath in override_dh_auto_configure, which runs after build-deps, so no bootstrap issue - configure.ac: stop the install branch from clobbering EMC2_TCL_DIR set by --with-tcl-dir
1 parent 78da77a commit 5277e32

3 files changed

Lines changed: 2 additions & 1 deletion

File tree

debian/control.top.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ Build-Depends:
4242
python3-dev,
4343
python3-tk,
4444
python3-xlib,
45+
tcl,
4546
tcl@TCLTK_VERSION@-dev,
4647
tclx,
4748
tk@TCLTK_VERSION@-dev,

lib/python/nf.py.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ def find_prefix(f):
105105
return find_prefix(os.path.dirname(f))
106106

107107
PREFIX = "@prefix@"
108+
EMC2_TCL_DIR = "@EMC2_TCL_DIR@"
108109
SHARE = os.path.join(PREFIX, "share", "axis")
109110
tcl_libdir = os.path.join(SHARE, "tcl")
110111

src/configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,6 @@ else
735735
EMC2_SCRIPT=$EMC2_BIN_DIR/linuxcnc
736736
EMC2_SUFFIX=""
737737
EMC2_ICON=linuxcncicon
738-
EMC2_TCL_DIR="${TCL_GET_DIR}/linuxcnc"
739738
EMC2_TCL_LIB_DIR="${EMC2_TCL_DIR}"
740739
EMC2_LANG_DIR="${EMC2_TCL_DIR}/msgs"
741740
EMC2_PO_DIR=${prefix}/share/locale

0 commit comments

Comments
 (0)