# HG changeset patch
# User ohair
# Date 1293049634 28800
# Node ID 60699c837ea8fd69c7a4828096cda2c539e82b5d
# Parent  6a3a53d8eacc5a3a3cf6bba16a5a7acbe69616ce# Parent  b63dcad65b800805bd8746eac341c5f655111ea0
Merge

diff -r 6a3a53d8eacc -r 60699c837ea8 Makefile
--- a/Makefile	Wed Dec 22 12:25:52 2010 -0800
+++ b/Makefile	Wed Dec 22 12:27:14 2010 -0800
@@ -456,7 +456,6 @@
 DEVTOOLS_PATH.desc         = Directory containing zip and gnumake
 CUPS_HEADERS_PATH.desc     = Include directory location for CUPS header files
 DXSDK_PATH.desc            = Root directory of DirectX SDK
-MSDEVTOOLS_PATH.desc       = Root directory of VC++ tools (e.g. rc.exe)
 MSVCRT_DLL_PATH.desc       = Directory containing mscvrt.dll
 
 # Make variables to print out (description and value)
@@ -487,12 +486,10 @@
 
 VARIABLE_PRINTVAL_LIST +=       \
     DXSDK_PATH                  \
-    MSDEVTOOLS_PATH             \
     MSVCRT_DLL_PATH
 
 VARIABLE_CHECKDIR_LIST +=       \
     DXSDK_PATH                  \
-    MSDEVTOOLS_PATH             \
     MSVCRT_DLL_PATH
 
 endif
diff -r 6a3a53d8eacc -r 60699c837ea8 README-builds.html
--- a/README-builds.html	Wed Dec 22 12:25:52 2010 -0800
+++ b/README-builds.html	Wed Dec 22 12:27:14 2010 -0800
@@ -1728,13 +1728,16 @@
                 <dt><strong>Windows specific:</strong></dt>
                 <dd>
                     <dl>
-                        <dt><a name="ALT_MSDEVTOOLS_PATH"><tt>ALT_MSDEVTOOLS_PATH</tt></a> </dt>
+                        <dt><a name="ALT_WINDOWSSDKDIR"><tt>ALT_WINDOWSSDKDIR</tt></a> </dt>
                         <dd>
                             The location of the 
-                            Microsoft Visual Studio
-                            tools 'bin' directory.
-                            The default is usually derived from
-                            <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a>.
+                            Microsoft Windows SDK where some tools will be
+			    located.
+			    The default is whatever WINDOWSSDKDIR is set to
+			    (or WindowsSdkDir) or the path
+			    <pre>
+                            c:\Program Files\Microsoft SDKs\Windows\v6.1a
+			    </pre>
                         </dd>
                         <dt><tt><a name="ALT_DXSDK_PATH">ALT_DXSDK_PATH</a></tt> </dt>
                         <dd>