From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 19 Dec 2009 04:36:26 +0000 (-0800)
Subject: Don't depend on special NT_INCLUDE environment variable; instead use
X-Git-Tag: 20100708-Gtk~197^2
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=4af07e4fbee66bd62d229e919a1e1b9d7075accd;p=mit-scheme.git

Don't depend on special NT_INCLUDE environment variable; instead use
standard WATCOM variable.
---

diff --git a/src/microcode/ntutl/makefile.wcc b/src/microcode/ntutl/makefile.wcc
index 70b357d38..66a1bc27d 100644
--- a/src/microcode/ntutl/makefile.wcc
+++ b/src/microcode/ntutl/makefile.wcc
@@ -34,14 +34,6 @@ CC = wcc386
 M4 = m4
 AS = wasm
 
-!ifdef __OS2__
-UTIL_SYSTEM = os2v2
-WRCFLAGS_SYSTEM = /i=$(%NT_INCLUDE)
-!else
-UTIL_SYSTEM = nt
-WRCFLAGS_SYSTEM = /i=$(%NT_INCLUDE)
-!endif
-
 # Compiler options.
 # [DEBUG] marks options used for debugging.
 # [OPTIMIZE] marks options used for optimization.
@@ -337,14 +329,14 @@ scheme.exe : $(OBJECTS) ntgui.res
 	wrc /q /ad /bt=nt ntgui.res $^@
 
 findprim.exe : findprim.obj
-	wlink system $(UTIL_SYSTEM) $(LDFLAGS) name $^@ file $[@
+	wlink system nt $(LDFLAGS) name $^@ file $[@
 
 findprim.obj : findprim.c
 	$(CC) $(UTIL_CFLAGS) $[@
 
 # Update the resource if necessary
 ntgui.res : ntgui.rc ntgui.h ntdialog.dlg ntdialog.h
-	wrc /q /ad /bt=nt /r /x /D__WATCOMC__ $(WRCFLAGS_SYSTEM) $[@
+	wrc /q /ad /bt=nt /r /x /D__WATCOMC__ /i=$(%WATCOM)\h\nt $[@
 
 usrdef.c : $(SOURCES) findprim.exe
 	.\findprim $(SOURCES) > $^@