From: Jeffrey Altman <jaltman@grand.central.org>
Date: Wed, 26 Nov 2003 21:32:52 +0000 (+0000)
Subject: ticket-2584-patches-20031126
X-Git-Tag: openafs-devel-1_3_50~4
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=93bd3784d68d56c33e1d94d19fbb18e7bfbf01ce

ticket-2584-patches-20031126
---

diff --git a/src/WINNT/client_config/NTMakefile b/src/WINNT/client_config/NTMakefile
index cea122e..a6c63f5 100644
--- a/src/WINNT/client_config/NTMakefile
+++ b/src/WINNT/client_config/NTMakefile
@@ -7,7 +7,7 @@
 
 # include the AFSD source tree on our inclusion path
 
-AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I ..\afsd
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I..\afsd
 
 # include the primary makefile
 RELDIR=WINNT\client_config
diff --git a/src/WINNT/client_creds/NTMakefile b/src/WINNT/client_creds/NTMakefile
index 9a94eed..2d6567c 100644
--- a/src/WINNT/client_creds/NTMakefile
+++ b/src/WINNT/client_creds/NTMakefile
@@ -7,7 +7,7 @@
 
 # include the AFSD source tree on our inclusion path
 
-AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I ..\afsd -I..\client_config
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I..\afsd -I..\client_config
 
 
 # include the primary makefile
diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index d22d3cb..fd84339 100644
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -53,6 +53,29 @@ AFSDEV_BUILDTYPE = NONE
 !UNDEF _CRTDBG_MAP_ALLOC
 !ENDIF
 
+# Limit default include and library directories to those specified for build.
+
+!IFNDEF AFSDEV_INCLUDE
+!ERROR Must define AFSDEV_INCLUDE to be the default include directories.
+!ENDIF
+
+!IF ((!DEFINED(INCLUDE)) && ([set INCLUDE=$(AFSDEV_INCLUDE)] != 0))
+#    If env. var. INCLUDE not defined then macro assignment won't set it.
+!ERROR Failed setting environment variable INCLUDE.
+!ENDIF
+INCLUDE = $(AFSDEV_INCLUDE)
+
+
+!IFNDEF AFSDEV_LIB
+!ERROR Must define AFSDEV_LIB to be the default library directories.
+!ENDIF
+
+!IF ((!DEFINED(LIB)) && ([set LIB=$(AFSDEV_LIB)] != 0))
+#    If env. var. LIB not defined then macro assignment won't set it.
+!ERROR Failed setting environment variable LIB.
+!ENDIF
+LIB = $(AFSDEV_LIB)
+
 #define used in WinNT/2000 installation and program version display
 AFSPRODUCT_VERSION=1.2.11
 AFSPRODUCT_FILE_VERSION=1,2,1100,0
diff --git a/src/ntbuild.bat b/src/ntbuild.bat
index f13d8ee..26d5ffe 100755
--- a/src/ntbuild.bat
+++ b/src/ntbuild.bat
@@ -81,6 +81,8 @@ REM     AFSVER_CL  = version of the Microsoft compiler "1200" for VC6;
 REM                  or "1300" for VC7 (.NET)
 REM                  or "1310" for .NET 2003
 
+set AFSVER_CL=1200
+
 set AFSDEV_BUILDTYPE=%AFSBLD_TYPE%
 
 REM Location of Microsoft Visual C++ development folder (8.3 short name)
@@ -93,10 +95,10 @@ REM Location of npapi.h (from DDK or Platform SDK samples - 8.3 short name)
 set NTDDKDIR=c:\progra~1\micros~5
 
 REM Location of netmpr.h/netspi.h (from Windows 95/98 DDK - 8.3 short name)
-SET 9XDDKDIR=c:\progra~1\micros~6
+SET W9XDDKDIR=c:\progra~1\micros~6
 
-set AFSDEV_INCLUDE=%MSSDKDIR%\include;%MSVCDIR%\include;%MSVCDIR%\mfc\include
-set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%NTDDKDIR%\include;%9XDDKDIR%\include
+set AFSDEV_INCLUDE=%MSSDKDIR%\include;%MSVCDIR%\atl\include;%MSVCDIR%\include;%MSVCDIR%\mfc\include
+set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%NTDDKDIR%\include;%W9XDDKDIR%\include
 set AFSDEV_LIB=%MSSDKDIR%\lib;%MSVCDIR%\lib;%MSVCDIR%\mfc\lib
 set AFSDEV_BIN=%MSSDKDIR%\bin;%MSVCDIR%\bin