From fef915553c73e02de80bf4eadd8a4b4113226961 Mon Sep 17 00:00:00 2001
From: Jean-Francois Lefebvre <jfl@mafact.com>
Date: Wed, 29 Nov 2006 22:29:17 +0000
Subject: [PATCH] 2006-11-29 23:30 UTC+0100 J. Lefebvre (jfl/at/mafact.com)

---
 harbour/ChangeLog   | 6 ++++++
 harbour/make_vc.bat | 8 ++++++++
 harbour/makefile.vc | 8 ++++----
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2564177feb..b3293b3b96 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2006-11-29 23:30 UTC+0100 J. Lefebvre (jfl/at/mafact.com)
+  * makefile.vc
+  * make_vc.bat
+    ! Fixed the COPY command to work on Windows-NT (/Y flag isn't supported)
+    * Sync. with makefile.bc & make_b32.bat.
+
 2006-11-28 16:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/Makefile
     + added hbcompdf.h and hbstdgen.ch
diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat
index ea2b1a1678..9c3fb7dfa4 100644
--- a/harbour/make_vc.bat
+++ b/harbour/make_vc.bat
@@ -21,6 +21,11 @@ rem ---------------------------------------------------------------
 
 if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe
 
+rem Save the user value, force silent file overwrite with COPY
+rem (not all Windows versions support the COPY /Y flag)
+set HB_ORGENV_COPYCMD=%COPYCMD%
+set COPYCMD=/Y
+
 rem ---------------------------------------------------------------
 
 if "%1" == "clean" goto CLEAN
@@ -71,3 +76,6 @@ rem ---------------------------------------------------------------
 rem ---------------------------------------------------------------
 
 :EXIT
+rem Restore user value
+set COPYCMD=%HB_ORGENV_COPYCMD%
+set HB_ORGENV_COPYCMD=
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index 1441ea1158..85f0b9bfa9 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -974,12 +974,12 @@ $(OBJ_DIR)\harboury.c : $(HARBOUR_DIR)\harbour.y
 !else
 
 $(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.yyc
-    copy /A /Y $** $@ >> inst_$(CC_DIRNAME).log
-    copy /A /Y $(**:.yyc=.yyh) $(@:.c=.h) >> inst_$(CC_DIRNAME).log
+    copy /A $** $@
+    copy /A $(**:.yyc=.yyh) $(@:.c=.h)
 
 $(OBJ_DIR)\harboury.c : $(HARBOUR_DIR)\harbour.yyc
-    copy /A /Y $** $@ >> inst_$(CC_DIRNAME).log
-    copy /A /Y $(**:.yyc=.yyh) $(@:.c=.h) >> inst_$(CC_DIRNAME).log
+    copy /A $** $@
+    copy /A $(**:.yyc=.yyh) $(@:.c=.h)
 
 !endif