From 5d6c8b7a50f680c200d19ecb11ab08c90416eec8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 12 Feb 2021 08:13:35 +0000
Subject: Better job of locating the tclsh binary (to be unzipped for
 --disable-shared). Also, don't abort build when it fails

---
 .github/workflows/onefiledist.yml | 7 ++-----
 unix/Makefile.in                  | 6 +++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml
index 9668cb5..f479165 100644
--- a/.github/workflows/onefiledist.yml
+++ b/.github/workflows/onefiledist.yml
@@ -24,7 +24,6 @@ jobs:
       - name: Setup Environment
         run: |
           sudo apt-get install libxss-dev
-          mkdir -p install/1dist.vfs
           touch tcl/generic/tclStubInit.c tcl/generic/tclOOStubInit.c
           touch tk/generic/tkStubInit.c
           echo "INST_DIR=$(cd install;pwd)" >> $GITHUB_ENV
@@ -64,7 +63,7 @@ jobs:
       - name: Describe Installation Zip Contents
         if: ${{ always() }}
         run: |
-          unzip -l 1dist.zip || true
+          unzip -l wish${{ env.TCL_PATCHLEVEL }}_unofficial || true
         working-directory: ${{ env.INST_DIR }}
   macos:
     name: macOS
@@ -94,7 +93,7 @@ jobs:
           path: create-dmg
       - name: Setup Environment
         run: |
-          mkdir -p install/1dist.vfs install/contents
+          mkdir -p install/contents
           touch tcl/generic/tclStubInit.c tcl/generic/tclOOStubInit.c
           touch tk/generic/tkStubInit.c
           echo "INST_DIR=$(cd install;pwd)" >> $GITHUB_ENV
@@ -172,7 +171,6 @@ jobs:
         run: choco install -y msys2 make zip
       - name: Setup Environment
         run: |
-          mkdir -p install/1dist
           mkdir -p install/combined
           touch tcl/generic/tclStubInit.c tcl/generic/tclOOStubInit.c
           touch tk/generic/tkStubInit.c
@@ -186,7 +184,6 @@ jobs:
       - name: Build & Install Tcl
         run: |
           make binaries libraries install
-          echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV
           $INST_DIR/bin/tclsh* $VER_PATH $GITHUB_ENV
         working-directory: tcl/win
       - name: Configure Tk
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 6f75076..b830c4e 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -112,7 +112,7 @@ TCL_PLATFORM_DIR	= $(TCLDIR)/unix
 # for this version of Tk:
 TCL_BIN_DIR		= @TCL_BIN_DIR@
 
-# The linker flags needed to link in the Tcl library (ex: -ltcl8.2)
+# The linker flags needed to link in the Tcl library (ex: -ltcl8.7)
 TCL_LIB_FLAG		= @TCL_LIB_FLAG@
 
 # Flag, 1: we're building a shared lib, 0 we're not
@@ -619,10 +619,10 @@ ${TK_ZIP_FILE}: ${ZIP_INSTALL_OBJS}
 	rm -rf ${TK_VFS_PATH}/demos
 	@find ${TK_VFS_ROOT} -type d -empty -delete
 	@echo "creating ${TK_ZIP_FILE} from ${TK_VFS_PATH}"
-	@if test "${ZIPFS_BUILD}" = "2" ; then \
+	-@if test "${ZIPFS_BUILD}" = "2" ; then \
 	    (zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}') 2>/dev/null || \
 		(echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?")`; \
-		cd ${TK_VFS_ROOT} && cp ${BUILD_TCLSH} ../${TK_ZIP_FILE} && $$zip -J ../${TK_ZIP_FILE}) \
+		cd ${TK_VFS_ROOT} && cp ${TCL_BIN_DIR}/../bin/tclsh${TCLVERSION} ../${TK_ZIP_FILE} && $$zip -J ../${TK_ZIP_FILE}) \
 	fi
 	@(zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}' || \
 	    echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?")  2>/dev/null`; \
-- 
cgit v0.12