--- cygnus/src/config/windows.in	Tue Jul  1 14:06:47 1997
+++ kerbnet-1.2/config/windows.in	Tue May 27 21:57:32 1997
@@ -11,11 +11,12 @@
 
 check:: check-$(WHAT)
 
-all-windiws::
+all-windows::
 clean-windows::
 install-windows::
 check-windows::
 
+DESTDIR=\winkrb5	# where things get installed
 
 # Directory syntax:
 R=\		# root
@@ -29,11 +30,20 @@
 # /* The name of the C compiler for the target */
 CC=cl /nologo
 CL=
-CCOPTS=/ALw /Zp /GD2s /Os /Zi /Od /W3 $(XTRA)
-CCOPTS2=/AL /Zp /G2s  /Os /Zi /Od /W3 -DINTERFACE= -DINTERFACE_C= $(XTRA)
+#
+# CCOPTS for DLL functions
+#
+##WIN16DLL##CCOPTS=/ALw /Zp /GD2s /Os /Zi /Od /W3 $(XTRA) -DKRB5_DLL_FILE
+##WIN32DLL##CCOPTS=/Os /Zi /Od /W3 $(XTRA) -DKRB5_DLL_FILE
+#
+# CCOPTS for non-DLL compiles
+#
+##WIN16STD##CCOPTS=/AL /Zp /G2s  /Os /Zi /Od /W3 $(XTRA)
+##WIN32STD##CCOPTS=/Os /Zi /Od /W3 $(XTRA)
+
 CPPFLAGS =  -I$(SRCTOP)/include -I$(SRCTOP)/include/krb5
 DEFS = $(CPPFLAGS)
-CFLAGS2 = $(CCOPTS2) $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
 
 # /Zi gives debug info in each object file.
 # /Zp packs structures: Required for Windows API (but is not default!!!)
@@ -52,11 +62,13 @@
 # /Mq quickwin ascii stdio window, and defines _WINDOWS
 DBG=/nologo /Zp /AL /Os /Mq /Zi /Od
 
-RM=$(BUILDTOP)\config\rm.bat
+RM=$(BUILDTOP)\util\windows\rm
+LIBECHO=$(BUILDTOP)\util\windows\libecho
 CP=copy
 MV=ren
 LN=copy
 LIBCMD=lib
+PAGESIZE=/pagesize:128
 AWK=rem
 
 ARADD=rem