From 813764c458ec766131b971e45d7ea5531e21f65b Mon Sep 17 00:00:00 2001
From: sebres <sebres@users.sourceforge.net>
Date: Fri, 23 Nov 2018 11:59:53 +0000
Subject: make/configure review: normalizes the latest fixes across unix/win

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

diff --git a/unix/Makefile.in b/unix/Makefile.in
index ebb7bc7..8dfb946 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -683,9 +683,8 @@ ${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
-	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 ..)
+	(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.
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 0d95f57..2f114d7 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -3011,7 +3011,7 @@ AC_DEFUN([SC_ZIPFS_SUPPORT], [
     done
     ])
     if test -f "$ac_cv_path_zip" ; then
-        ZIP_PROG="$ac_cv_path_zip "
+        ZIP_PROG="$ac_cv_path_zip"
         AC_MSG_RESULT([$ZIP_PROG])
         ZIP_PROG_OPTIONS="-rq"
         ZIP_PROG_VFSSEARCH="."
diff --git a/win/Makefile.in b/win/Makefile.in
index 1703c4d..1fb9361 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -490,8 +490,8 @@ ${TCL_ZIP_FILE}:  ${ZIP_INSTALL_OBJS} ${DDE_DLL_FILE} ${REG_DLL_FILE}
 	$(COPY) -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl
 	$(COPY) ${DDE_DLL_FILE} ${TCL_VFS_PATH}/dde
 	$(COPY) ${REG_DLL_FILE} ${TCL_VFS_PATH}/reg
-	(cd ${TCL_VFS_ROOT} && \
-	  ${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 ..)
 
 $(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES)
diff --git a/win/tcl.m4 b/win/tcl.m4
index bdcd8ea..a58dc2f 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -1267,7 +1267,7 @@ AC_DEFUN([SC_ZIPFS_SUPPORT], [
     done
     ])
     if test -f "$ac_cv_path_zip" ; then
-        ZIP_PROG="$ac_cv_path_zip "
+        ZIP_PROG="$ac_cv_path_zip"
         AC_MSG_RESULT([$ZIP_PROG])
         ZIP_PROG_OPTIONS="-rq"
         ZIP_PROG_VFSSEARCH="."
@@ -1276,7 +1276,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