From de3fd77202d2f00e549b962c6b56a85f5d8d7042 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 12 Oct 2015 09:57:26 +0000
Subject: Various build fixes, when using Cygwin shell in combination with
 native MinGW compiler. Contributed by pooryorick.

---
 win/Makefile.in | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/win/Makefile.in b/win/Makefile.in
index b3417e7..e9a28c4 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -102,10 +102,15 @@ COMPAT_DIR		= @srcdir@/../compat
 # Converts a POSIX path to a Windows native path.
 CYGPATH			= @CYGPATH@
 
-GENERIC_DIR_NATIVE	= $(shell $(CYGPATH) '$(GENERIC_DIR)' | sed 's!\\!/!g')
-TOMMATH_DIR_NATIVE	= $(shell $(CYGPATH) '$(TOMMATH_DIR)' | sed 's!\\!/!g')
-WIN_DIR_NATIVE		= $(shell $(CYGPATH) '$(WIN_DIR)' | sed 's!\\!/!g')
-ROOT_DIR_NATIVE		= $(shell $(CYGPATH) '$(ROOT_DIR)' | sed 's!\\!/!g')
+libdir_native	= $(shell $(CYGPATH) '$(libdir)')
+bindir_native	= $(shell $(CYGPATH) '$(bindir)')
+includedir_native = $(shell $(CYGPATH) '$(includedir)')
+mandir_native = $(shell $(CYGPATH) '$(mandir)')
+TCL_LIBRARY_NATIVE	= $(shell $(CYGPATH) '$(TCL_LIBRARY)')
+GENERIC_DIR_NATIVE	= $(shell $(CYGPATH) '$(GENERIC_DIR)')
+TOMMATH_DIR_NATIVE	= $(shell $(CYGPATH) '$(TOMMATH_DIR)')
+WIN_DIR_NATIVE		= $(shell $(CYGPATH) '$(WIN_DIR)')
+ROOT_DIR_NATIVE		= $(shell $(CYGPATH) '$(ROOT_DIR)')
 #GENERIC_DIR_NATIVE	= $(GENERIC_DIR)
 #TOMMATH_DIR_NATIVE	= $(TOMMATH_DIR)
 #WIN_DIR_NATIVE		= $(WIN_DIR)
@@ -114,7 +119,7 @@ ROOT_DIR_NATIVE		= $(shell $(CYGPATH) '$(ROOT_DIR)' | sed 's!\\!/!g')
 # Fully qualify library path so that `make test`
 # does not depend on the current directory.
 LIBRARY_DIR1		= $(shell cd '$(ROOT_DIR_NATIVE)/library' ; pwd)
-LIBRARY_DIR             = $(shell $(CYGPATH) '$(LIBRARY_DIR1)' | sed 's!\\!/!g')
+LIBRARY_DIR             = $(shell $(CYGPATH) '$(LIBRARY_DIR1)')
 DLLSUFFIX		= @DLLSUFFIX@
 LIBSUFFIX		= @LIBSUFFIX@
 EXESUFFIX		= @EXESUFFIX@
@@ -503,17 +508,17 @@ tclWinDde.${OBJEXT} : tclWinDde.c
 
 tclPkgConfig.${OBJEXT}: tclPkgConfig.c
 	$(CC)	-c $(CC_SWITCHES)			\
-		-DCFG_INSTALL_LIBDIR=\"$(LIB_INSTALL_DIR)\" \
-		-DCFG_INSTALL_BINDIR=\"$(BIN_INSTALL_DIR)\" \
-		-DCFG_INSTALL_SCRDIR=\"$(SCRIPT_INSTALL_DIR)\" \
-		-DCFG_INSTALL_INCDIR=\"$(INCLUDE_INSTALL_DIR)\" \
+		-DCFG_INSTALL_LIBDIR=\"$(LIB_INSTALL_DIR_NATIVE)\" \
+		-DCFG_INSTALL_BINDIR=\"$(BIN_INSTALL_DIR_NATIVE)\" \
+		-DCFG_INSTALL_SCRDIR=\"$(SCRIPT_INSTALL_DIR_NATIVE)\" \
+		-DCFG_INSTALL_INCDIR=\"$(INCLUDE_INSTALL_DIR_NATIVE)\" \
 		-DCFG_INSTALL_DOCDIR=\"$(MAN_INSTALL_DIR)\" \
 		\
-		-DCFG_RUNTIME_LIBDIR=\"$(libdir)\" \
-		-DCFG_RUNTIME_BINDIR=\"$(bindir)\" \
-		-DCFG_RUNTIME_SCRDIR=\"$(TCL_LIBRARY)\" \
-		-DCFG_RUNTIME_INCDIR=\"$(includedir)\" \
-		-DCFG_RUNTIME_DOCDIR=\"$(mandir)\" \
+		-DCFG_RUNTIME_LIBDIR=\"$(libdir_native)\" \
+		-DCFG_RUNTIME_BINDIR=\"$(bindir_native)\" \
+		-DCFG_RUNTIME_SCRDIR=\"$(TCL_LIBRARY_NATIVE)\" \
+		-DCFG_RUNTIME_INCDIR=\"$(includedir_native)\" \
+		-DCFG_RUNTIME_DOCDIR=\"$(mandir_native)\" \
 		-DBUILD_tcl \
 		@DEPARG@ $(CC_OBJNAME)
 
-- 
cgit v0.12