$NetBSD: patch-aa,v 1.2 2001/06/20 06:53:41 jtb Exp $

--- makefile.orig	Mon Apr  6 17:13:12 1998
+++ makefile
@@ -12,7 +12,7 @@
 OBJECTDIR = objects
 EMBOBJECTDIR = embobjects
 
-FULL_WARNINGS =  -O2 \
+FULL_WARNINGS = \
         -fsigned-char \
         -fno-builtin \
         -fno-unroll-loops \
@@ -26,8 +26,9 @@
         -Wmissing-prototypes \
         -Wmissing-declarations
         
-CCOPTS = -DPF_SUPPORT_FP $(FULL_WARNINGS)
-COMPILER = gcc
+CFLAGS += -DPF_SUPPORT_FP $(FULL_WARNINGS)
+
+CDEFS = -DPF_DIC=\"${PREFIX}/lib/pforth/pforth.dic\"
 
 EMBCCOPTS = -DPF_NO_INIT -DPF_NO_MALLOC -DPF_NO_FILEIO \
     -DPF_NO_CLIB -DPF_STATIC_DIC
@@ -41,13 +42,13 @@
 PFOBJS     = ${PFTEMP:${SOURCEDIR}/%=${OBJECTDIR}/%}
 PFEMBOBJS  = ${PFTEMP:${SOURCEDIR}/%=${EMBOBJECTDIR}/%}
 
-COMPILE = $(COMPILER) $(CCOPTS) $(CDEFS)
+COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(CDEFS)
 
 ${OBJECTDIR}/%.o:  $(PFINCLUDES)  ${SOURCEDIR}/%.c
-	$(COMPILE) -O -o ${OBJECTDIR}/$*.o -c ${SOURCEDIR}/$*.c
-	
+	$(COMPILE) -o ${OBJECTDIR}/$*.o -c ${SOURCEDIR}/$*.c
+
 ${EMBOBJECTDIR}/%.o:  $(PFINCLUDES) ${SOURCEDIR}/%.c ${SOURCEDIR}/pfdicdat.h 
-	$(COMPILE) -O -o ${EMBOBJECTDIR}/$*.o -c ${SOURCEDIR}/$*.c $(EMBCCOPTS)
+	$(COMPILE) -o ${EMBOBJECTDIR}/$*.o -c ${SOURCEDIR}/$*.c $(EMBCCOPTS)
 
 all: pforth pforth.dic
 
@@ -62,26 +63,26 @@
 	echo ${PFOBJS}
 	echo "EMBEDDED OBJECT FILES ------------------"
 	echo ${PFEMBOBJS}
-	
+
 # build pforth by compiling 'C' source
 pforth: $(PFINCLUDES) $(PFOBJS)
-	$(COMPILER) $(PFOBJS) -lm -o pforth
+	$(CC) $(PFOBJS) -lm -o pforth
 
 # build basic dictionary by running newly built pforth and including system.fth
 pforth.dic: pforth
-	pforth -i system.fth
+	./pforth -i system.fth
 
 ${SOURCEDIR}/pfdicdat.h: pforth pforth.dic
 	@(echo 'INCLUDE utils/savedicd.fth'; \
           echo 'SDAD';         \
           echo 'bye')                                 | \
-	pforth -dpforth.dic
+	./pforth -dpforth.dic
 	cp pfdicdat.h ${SOURCEDIR}
 
 
 pfemb: $(PFINCLUDES) $(PFEMBOBJS)
-	$(COMPILER) $(PFEMBOBJS) -lm -o pfemb
-	
+	$(CC) $(PFEMBOBJS) -lm -o pfemb
+
 clean:
 	rm -f $(PFOBJS) $(PFEMBOBJS) pforth *.dic core ${SOURCEDIR}/pfdicdat.h pfemb