From c4931601c6a9e5b51b002126fe484cc12fc9a4a9 Mon Sep 17 00:00:00 2001
From: Gunter Knauf <gk@gknw.de>
Date: Sat, 30 Jun 2007 21:20:24 +0000
Subject: [PATCH] fixed path to Metrowerks tools and runtime since they changed
 between compiler versions.

---
 lib/Makefile.netware | 11 ++++++++---
 src/Makefile.netware | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index ea3acd398..495d51422 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -65,10 +65,14 @@ endif
 
 # The following line defines your compiler.
 ifdef METROWERKS
+	# MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
+	MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
 	CC = mwccnlm
 else
 	CC = gcc
 endif
+# a native win32 awk can be downloaded from here:
+# http://www.gknw.net/development/prgtools/awk-20050424.zip
 AWK	= awk
 YACC	= bison -y
 CP	= cp -afv
@@ -95,9 +99,10 @@ ifeq ($(LIBARCH),LIBC)
 	PRELUDE = $(SDK_LIBC)/imports/libcpre.o
 	CFLAGS += -align 4
 else
-	PRELUDE = "$(subst \,/,$(METROWERKS))/Novell Support/libraries/runtime/prelude.obj"
-	PRELUDE += "$(subst \,/,$(METROWERKS))/Novell Support/libraries/runtime/mwcrtl.lib"
-	CFLAGS += -include "$(subst \,/,$(METROWERKS))/Novell Support/headers/nlm_clib_prefix.h"
+	PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
+	# PRELUDE += "$(MWCW_PATH)/libraries/runtime/mwcrtl.lib"
+	PRELUDE += "$(MWCW_PATH)/libraries/runtime/output/clib/mwcrtl.lib"
+	CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
 	CFLAGS += -align 1
 endif
 else
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 70df5d5a3..7bd63ac51 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -66,10 +66,14 @@ endif
 
 # The following line defines your compiler.
 ifdef METROWERKS
+	# MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
+	MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
 	CC = mwccnlm
 else
 	CC = gcc
 endif
+# a native win32 awk can be downloaded from here:
+# http://www.gknw.net/development/prgtools/awk-20050424.zip
 AWK	= awk
 CP	= cp -afv
 # RM	= rm -f
@@ -92,9 +96,10 @@ ifeq ($(LIBARCH),LIBC)
 	PRELUDE = $(SDK_LIBC)/imports/libcpre.o
 	CFLAGS += -align 4
 else
-	PRELUDE = "$(METROWERKS)/Novell Support/libraries/runtime/prelude.obj"
-	PRELUDE += "$(subst \,/,$(METROWERKS))/Novell Support/libraries/runtime/mwcrtl.lib"
-	CFLAGS += -include "$(subst \,/,$(METROWERKS))/Novell Support/headers/nlm_clib_prefix.h"
+	PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
+	# PRELUDE += "$(MWCW_PATH)/libraries/runtime/mwcrtl.lib"
+	PRELUDE += "$(MWCW_PATH)/libraries/runtime/output/clib/mwcrtl.lib"
+	CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
 	CFLAGS += -align 1
 endif
 else