Simplify win32.mak and win64.mak a little bit.

Change the way we test whether a directory exists, so that we don't need
a version check for Windows NT. (although we probably don't need to support
compiling on NT anymore anyway)

diff --git a/win32.mak b/win32.mak
index 6f5f0606d6d1fa7876abd986b656f1294fed42b6..7dc0c05b83c21cde4981c50bdd04143f1d79ca3f 100644 (file)
--- a/win32.mak
+++ b/win32.mak
@@ -133,12 +133,6 @@ INC_OPT = $(INC_OPT) /I "$(PG_INC)"
 INC_OPT = $(INC_OPT) /I "$(SSL_INC)"
 !ENDIF
 
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
 !IF "$(ANSI_VERSION)" == "yes"
 MAINLIB = psqlodbc30a
 !ELSE
@@ -195,10 +189,11 @@ CLEAN :
 !ENDIF
 
 "$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-!IF "$(OUTDIR)" != "$(INTDIR)"
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+!IF !EXISTS($(INTDIR))
+    mkdir "$(INTDIR)"
+!ENDIF
+!IF !EXISTS($(OUTDIR)) && "$(OUTDIR)" != "$(INTDIR)"
+    mkdir "$(OUTDIR)"
 !ENDIF
 
 !IF  "$(MSDTC)" != "no"

diff --git a/win64.mak b/win64.mak
index 9de9e6c68a2f94afbd8197b41bb81a2015d465de..60655bab5e726075d6bc163a1ff95ca244dcaf13 100755 (executable)
--- a/win64.mak
+++ b/win64.mak
@@ -140,12 +140,6 @@ INC_OPT = $(INC_OPT) /I "$(GSS_INC)"
 INC_OPT = $(INC_OPT) /I "$(ADD_INC)"
 !ENDIF
 
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
 !IF "$(ANSI_VERSION)" == "yes"
 MAINLIB = psqlodbc30a
 !ELSE
@@ -199,10 +193,11 @@ CLEAN :
 !ENDIF
 
 "$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-!IF "$(OUTDIR)" != "$(INTDIR)"
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+!IF !EXISTS($(INTDIR))
+    mkdir "$(INTDIR)"
+!ENDIF
+!IF !EXISTS($(OUTDIR)) && "$(OUTDIR)" != "$(INTDIR)"
+    mkdir "$(OUTDIR)"
 !ENDIF
 
 !IF  "$(MSDTC)" != "no"