From 92ac862af2002da74a595ba1dadc851d762a2f70 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Mon, 2 Jun 2014 22:23:26 +0300
Subject: [PATCH] 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)
---
 win32.mak | 15 +++++----------
 win64.mak | 15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/win32.mak b/win32.mak
index 6f5f060..7dc0c05 100644
--- 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 9de9e6c..60655ba 100755
--- 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"
-- 
2.39.5