From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Fri, 10 Jul 2009 15:16:25 +0000 (-0400)
Subject: The Windows Makefiles provide macros for various commands.
X-Git-Tag: openafs-devel-1_5_61~164
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=386fea8d86b6debeb81355ba9bdede83b2f7285d;p=packages%2Fo%2Fopenafs.git

The Windows Makefiles provide macros for various commands.
The MKDIR macro is current assigned to mkdir which causes
the cygwin/msys mkdir.exe commands to be used instead of
the cmd.exe built-in command.  Change this to use "md" instead
so that the built-in will be used by default.

In addition, permit the macros to be overridden by the top
level NTMakefile or the environment.

LICENSE MIT

Reviewed-on: http://gerrit.openafs.org/30
Verified-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 763a07c5e..549b7b676 100644
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -177,18 +177,36 @@ APPVER=5.02
 # Extend and/or supplement definitions in WIN32.MAK.
 
 # Command macros.
+!IF !DEFINED(COPY)
 COPY = -copy
+!ENDIF
+!IF !DEFINED(DEL)
 DEL = -del
-MKDIR = -mkdir
+!ENDIF
+!IF !DEFINED(MKDIR)
+MKDIR = -md
+!ENDIF
+!IF !DEFINED(REN)
 REN = ren
+!ENDIF
+!IF !DEFINED(ECHO)
 ECHO = echo
+!ENDIF
+!IF !DEFINED(CD)
 CD = cd
+!ENDIF
+!IF !DEFINED(MC)
 MC = mc -vcsU
+!ENDIF
+!IF !DEFINED(MAKECMD)
 MAKECMD = nmake.exe
+!ENDIF
+!IF !DEFINED(MIDL)
+MIDL  = midl
+!ENDIF
 
 COMPILE_ET = $(DESTDIR)\bin\compile_et
 RXGEN = $(DESTDIR)\bin\rxgen
-MIDL  = midl
 
 # Common clean target.
 clean::
diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index 0433b2cbf..c3c81558e 100644
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -183,18 +183,36 @@ APPVER=5.0
 # Extend and/or supplement definitions in WIN32.MAK.
 
 # Command macros.
+!IF !DEFINED(COPY)
 COPY = -copy
+!ENDIF
+!IF !DEFINED(DEL)
 DEL = -del
-MKDIR = -mkdir
+!ENDIF
+!IF !DEFINED(MKDIR)
+MKDIR = -md
+!ENDIF
+!IF !DEFINED(REN)
 REN = ren
+!ENDIF
+!IF !DEFINED(ECHO)
 ECHO = echo
+!ENDIF
+!IF !DEFINED(CD)
 CD = cd
+!ENDIF
+!IF !DEFINED(MC)
 MC = mc -vcsU
+!ENDIF
+!IF !DEFINED(MAKECMD)
 MAKECMD = nmake.exe
+!ENDIF
+!IF !DEFINED(MIDL)
+MIDL  = midl
+!ENDIF
 
 COMPILE_ET = $(DESTDIR)\bin\compile_et
 RXGEN = $(DESTDIR)\bin\rxgen
-MIDL  = midl
 
 # Common clean target.
 clean::
diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 9143359c7..ff3ffca35 100644
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -187,18 +187,36 @@ APPVER=5.0
 # Extend and/or supplement definitions in WIN32.MAK.
 
 # Command macros.
+!IF !DEFINED(COPY)
 COPY = -copy
+!ENDIF
+!IF !DEFINED(DEL)
 DEL = -del
-MKDIR = -mkdir
+!ENDIF
+!IF !DEFINED(MKDIR)
+MKDIR = -md
+!ENDIF
+!IF !DEFINED(REN)
 REN = ren
+!ENDIF
+!IF !DEFINED(ECHO)
 ECHO = echo
+!ENDIF
+!IF !DEFINED(CD)
 CD = cd
+!ENDIF
+!IF !DEFINED(MC)
 MC = mc -vcsU
+!ENDIF
+!IF !DEFINED(MAKECMD)
 MAKECMD = nmake.exe
+!ENDIF
+!IF !DEFINED(MIDL)
+MIDL  = midl
+!ENDIF
 
 COMPILE_ET = $(DESTDIR)\bin\compile_et
 RXGEN = $(DESTDIR)\bin\rxgen
-MIDL  = midl
 
 # Common clean target.
 clean::