X-Git-Url: http://ecere.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=crossplatform.mk;h=fe87fd75775a3cc891934ff1ba23557c4531940c;hb=3e9dd9e09ea1d69476041c624edb3a4c2b36e87d;hp=bfe31a0e0d0e558ccf9d5b1a7ae28a7fd7302e8a;hpb=dbaf422ff1c4e4beeb60198aaa2f6118d66e00f8;p=sdk

diff --git a/crossplatform.mk b/crossplatform.mk
index bfe31a0..fe87fd7 100644
--- a/crossplatform.mk
+++ b/crossplatform.mk
@@ -215,9 +215,11 @@ hs_crossloop = $(call hs_unsafe_crossloop,$(call fp_no_parent_dir,$(1)),$(2))
 
 # PATH SEPARATOR STRING TOOLS
 ifdef WINDOWS_HOST
-ifndef MSYSCON
-   WIN_PS_TOOLS := defined
-endif
+   ifneq ($(TERM),cygwin)
+      ifndef MSYSCON
+         WIN_PS_TOOLS := defined
+      endif
+   endif
 endif
 slash_path = $(subst $(backslash),$(slash),$(1))
 ifdef WIN_PS_TOOLS
@@ -269,11 +271,15 @@ _CPP = $(if $(findstring $(space),$(CPP)),"$(CPP)",$(CPP))
 
 _SYSROOT = $(if $(SYSROOT),$(space)--sysroot=$(SYSROOT),)
 
+_MAKE = $(call fp_opt_quotes,$(MAKE))
+
 # SHELL COMMANDS
 ifdef WINDOWS_HOST
-ifndef MSYSCON
-   WIN_SHELL_COMMANDS := defined
-endif
+   ifneq ($(TERM),cygwin)
+      ifndef MSYSCON
+         WIN_SHELL_COMMANDS := defined
+      endif
+   endif
 endif
 ifneq ($(V),1)
    SILENT_IS_ON := defined
@@ -299,8 +305,8 @@ else
    nullerror = 2>/dev/null
    echo = $(if $(1),echo "$(1)")
    touch = $(if $(1),touch $(1))
-   cp = $(if $(1),cp$(if $(SILENT_IS_ON),, -v) $(1) $(2))
-   cpr = $(if $(1),cp -prf$(if $(SILENT_IS_ON),,v) $(1) $(2))
+   cp = $(if $(1),cp -P$(if $(SILENT_IS_ON),,v) $(1) $(2))
+   cpr = $(if $(1),cp -PR$(if $(SILENT_IS_ON),,v) $(1) $(2))
    rm = $(if $(1),-rm -f$(if $(SILENT_IS_ON),,v) $(1))
    rmr = $(if $(1),-rm -fr$(if $(SILENT_IS_ON),,v) $(1))
    mkdir = $(if $(1),-mkdir -p$(if $(SILENT_IS_ON),,v) $(1))