From d87658ef0b84657deb3c50f980ec2ea7f61f00ba Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 7 Mar 2000 22:25:29 +0000
Subject: [PATCH] 20000307-23:26 GMT+1 Victor Szakats <info@szelvesz.hu>

---
 harbour/ChangeLog   |  6 ++++++
 harbour/makefile.vc | 17 ++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4c0d95f2e1..72d59cf794 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+20000307-23:26 GMT+1 Victor Szakats <info@szelvesz.hu>
+   * makefile.vc
+     ! UNISTD.H problem solved with another method, now it doesn't leave
+       the temporary UNISTD.H in the INCLUDE dir, so that it will not conflict
+       with the GCC make process.
+
 20000307-21:06 GMT+1 Victor Szakats <info@szelvesz.hu>
    * doc/whatsnew.txt
      + Build 31c things added.
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index 77fb110c5c..3a1a959462 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -66,7 +66,6 @@ RUNNER_DLL=$(BIN_DIR)\runjava.dll
 HBTEST_EXE=$(BIN_DIR)\hbtest.exe
 HBDOC_EXE=$(BIN_DIR)\hbdoc.exe
 HARBOURFLAGS=-iinclude -n -q0 -w -es2 -gc0
-UNISTD=include\unistd.h
 
 LIBLIST = \
     $(RTL_LIB) \
@@ -91,7 +90,7 @@ LIBS = \
     $(MACRO_LIB)
 
 #
-# OBJ list for harbour.lib. Add new ones as needed
+# OBJ list for rtl.lib. Add new ones as needed
 #
 
 RTL_LIB_OBJS = \
@@ -177,7 +176,7 @@ RTL_LIB_OBJS = \
 #
 # OBJ list for tools.lib. Add new ones as needed
 #
-#$(OBJ_DIR)\genobj.obj \ PatrickMast
+
 TOOLS_LIB_OBJS = \
     $(OBJ_DIR)\asciisum.obj \
     $(OBJ_DIR)\ascpos.obj \
@@ -229,7 +228,7 @@ MACRO_LIB_OBJS = \
     $(OBJ_DIR)\macro.obj
 
 #
-# OBJ list for rdds. Add new ones as needed
+# OBJ list for rdd.lib. Add new ones as needed
 #
 
 RDD_LIB_OBJS = \
@@ -324,8 +323,7 @@ VM_LIB_OBJS = \
 # Our default target
 #
 
-all: $(UNISTD) \
-     $(HARBOUR_EXE) \
+all: $(HARBOUR_EXE) \
      $(LIBLIST) \
      $(PP_EXE) \
      $(RUNNER_EXE) \
@@ -333,9 +331,6 @@ all: $(UNISTD) \
      $(HBDOC_EXE) \
 #    $(RUNNER_DLL)
 
-$(UNISTD):
-   command /c echo. >include\unistd.h
-
 $(PP_EXE) : \
     $(PP_DIR)\stdalone\hbpp.c \
     $(COMMON_DIR)\hbfsapi.c \
@@ -439,7 +434,9 @@ $(HARBOUR_EXE) : \
     $(PP_DIR)\ppcore.c \
     $(PP_DIR)\ppcomp.c \
     $(PP_DIR)\pptable.c
+    command /c echo. > include\unistd.h
     $(CC) $(CFLAGS) -w $** -o $(HARBOUR_EXE)
+    command /c del include\unistd.h
     -del harbour.obj
     -del harboury.obj
     -del harbourl.obj
@@ -526,7 +523,9 @@ $(OBJ_DIR)\macroy.obj : $(OBJ_DIR)\macroy.c
     $(CC) $(CLIBFLAGS) -w -DYY_NEVER_INTERACTIVE -Fo$@ $**
 
 $(OBJ_DIR)\macrol.obj : $(OBJ_DIR)\macrol.c
+    command /c echo. > include\unistd.h
     $(CC) $(CLIBFLAGS) -w -DYY_NEVER_INTERACTIVE -Fo$@ $**
+    command /c del include\unistd.h
 
 $(OBJ_DIR)\macro.obj : $(MACRO_DIR)\macro.c
     $(CC) $(CLIBFLAGS) -Fo$@ $**