From a694d92cbd24f1420fb67564e12fb1420a86ab9f Mon Sep 17 00:00:00 2001
From: sebres <sebres@users.sourceforge.net>
Date: Thu, 22 Nov 2018 23:17:11 +0000
Subject: unix build (if ZIPFS_BUILD): fixed relative path to zip-program (in
 case of minizip), ignore possible zip-error by adjust sfx process (similar to
 [057d2b674d]).

---
 unix/Makefile.in | 7 +++++--
 unix/configure   | 2 +-
 unix/tcl.m4      | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 6061298..ebb7bc7 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -683,7 +683,9 @@ ${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS}
 	cp -a $(TOP_DIR)/library/* ${TCL_VFS_PATH}
 	cp -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl
 	find ${TCL_VFS_ROOT} -type d -empty -delete
-	( cd ${TCL_VFS_ROOT} ; ${NATIVE_ZIP} ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH})
+	echo "${NATIVE_ZIP} ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH}"
+	(zip=`readlink -m '${NATIVE_ZIP}'`; \
+	  cd ${TCL_VFS_ROOT} && $$zip ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH} && cd ..)
 
 # The following target is configured by autoconf to generate either a shared
 # library or non-shared library for Tcl.
@@ -692,7 +694,8 @@ ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} ${TCL_ZIP_FILE}
 	@MAKE_LIB@
 	@if test "${ZIPFS_BUILD}" = "1" ; then \
 		cat ${TCL_ZIP_FILE} >> ${LIB_FILE}; \
-	  ${NATIVE_ZIP} -A ${LIB_FILE}; \
+		${NATIVE_ZIP} -A ${LIB_FILE} \
+		  || echo 'ignore zip-error by adjust sfx process (not executable?)'; \
 	fi
 
 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
diff --git a/unix/configure b/unix/configure
index d963fbe..84948c1 100755
--- a/unix/configure
+++ b/unix/configure
@@ -10109,7 +10109,7 @@ $as_echo "Found INFO Zip in environment" >&6; }
     else
         # It is not an error if an installed version of Zip can't be located.
         # We can use the locally distributed minizip instead
-        ZIP_PROG="../minizip${EXEEXT_FOR_BUILD}"
+        ZIP_PROG="./minizip${EXEEXT_FOR_BUILD}"
         ZIP_PROG_OPTIONS="-o -r"
         ZIP_PROG_VFSSEARCH="."
         ZIP_INSTALL_OBJS="minizip${EXEEXT_FOR_BUILD}"
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 6955ace..0d95f57 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -3020,7 +3020,7 @@ AC_DEFUN([SC_ZIPFS_SUPPORT], [
     else
         # It is not an error if an installed version of Zip can't be located.
         # We can use the locally distributed minizip instead
-        ZIP_PROG="../minizip${EXEEXT_FOR_BUILD}"
+        ZIP_PROG="./minizip${EXEEXT_FOR_BUILD}"
         ZIP_PROG_OPTIONS="-o -r"
         ZIP_PROG_VFSSEARCH="."
         ZIP_INSTALL_OBJS="minizip${EXEEXT_FOR_BUILD}"
-- 
cgit v0.12