Fix install of clock.tcl (#9)

* workaround for lib/clock.tcl not yet existing during configure using lib_BINARIES in Makefile
* improve path searching for generated clock.tcl
* log error message on failure
* update to 8.6.709
* avoid overloading stubs terminology

.github/workflows/linux-ci.yml

@@ -56,7 +56,7 @@ jobs:
 
       - name: runtime test
         run: |
-          echo 'if {[catch {package require tclclockmod; clock format -now}]} {puts stderr "ERROR!"; exit 1} else {puts "OK."}' | tclsh
+          echo 'if {[catch {package require tclclockmod; clock format -now} catchResult]} {puts stderr "ERROR! $catchResult"; exit 1} else {puts "OK."}' | tclsh
 
       - name: clean
         run: |

Makefile.in

@@ -60,7 +60,7 @@ PKG_HEADERS	= @PKG_HEADERS@
 PKG_LIB_FILE	= @PKG_LIB_FILE@
 PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
 
-lib_BINARIES	= $(PKG_LIB_FILE)
+lib_BINARIES	= $(PKG_LIB_FILE) lib/clock.tcl
 BINARIES	= $(lib_BINARIES)
 
 SHELL		= @SHELL@
@@ -159,7 +159,7 @@ PKG_CFLAGS	= @PKG_CFLAGS@
 DEFS		= @DEFS@ $(PKG_CFLAGS)
 
 # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
-CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
+CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl lib/clock.tcl
 CLEANFILES	= @CLEANFILES@
 
 CPPFLAGS	= @CPPFLAGS@

configure.ac

@@ -17,7 +17,7 @@ dnl	to configure the system for the local environment.
 # so you can encode the package version directly into the source files.
 #-----------------------------------------------------------------------
 
-AC_INIT([tclclockmod], [8.6.707])
+AC_INIT([tclclockmod], [8.6.709])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.
@@ -129,7 +129,7 @@ TEA_ADD_SOURCES([generic/tclClock.c           \
 
 #TEA_ADD_STUB_SOURCES([])
 
-TEA_ADD_TCL_SOURCES([lib/clock.tcl.in])
+
 
 #--------------------------------------------------------------------
 # Add --with-tzpath flag to set zoneinfo directory

lib/loader.tcl

@@ -6,7 +6,7 @@ proc ::clock args {
   # first try from lib directory (like installed):
   set lib [glob -nocomplain [file join $::tcl::clock::LibDir tclclockmod*[info sharedlibextension]]]
   # second try find library from current directory (debug, release, platform etc.),
-  # hereafter in path relative current lib (like unistalled):
+  # hereafter in path relative current lib (like uninstalled):
   if {![llength $lib]} {
     foreach plib [list [pwd] [file dirname $::tcl::clock::LibDir]] {
       # now from unix, win, Release:
@@ -33,8 +33,19 @@ proc ::clock args {
   # load library:
   load [lindex $lib 0]
 
-  # overload new tcl-clock stubs:
-  source [file join $::tcl::clock::LibDir clock.tcl]
+
+  # first try from the lib directory (like installed):
+  # second try to find in the same directory as the shared library.
+  set ensemble [glob -nocomplain [file join $::tcl::clock::LibDir clock.tcl] \
+                 [file join [file dirname [lindex $lib 0]] clock.tcl] \
+                 [file join [file dirname [lindex $lib 0]] lib/clock.tcl] \
+                ]
+  if {![llength $ensemble]} {
+    error "tclclockmod ensemble file not found relative \"[pwd]\"."
+  }
+
+  # overload new tcl-clock ensemble file:
+  source [lindex $ensemble 0]
 
   # and ensemble:
   set cmdmap [dict create]