$FreeBSD$

--- GNUmakefile.in.orig	Fri Jan 12 12:26:15 2001
+++ GNUmakefile.in	Mon Aug 27 11:10:25 2001
@@ -46,12 +46,11 @@
 GENCONST = gentable.rb
 POSTPROC = postcmpl.rb
 
-INCDIR = -I${J_INCDIR} -I${J_INCDIR}/genunix -I${J_INCDIR}/linux -I${J_INCDIR}/freebsd -I${J_INCDIR}/netbsd -I/usr/local/include
+INCDIR = -I${J_INCDIR} -I${J_INCDIR}/genunix -I${J_INCDIR}/linux -I${J_INCDIR}/bsd -I${J_INCDIR}/freebsd -I${J_INCDIR}/netbsd -I${LOCALBASE}/include -I${JAVADIR}/include -I${JAVADIR}/include/bsd
 
-OPTFLAGS = -O2
 CDEBUGFLAGS =# -g -DDEBUG -DCOMPILE_DEBUG# -DRUNTIME_DEBUG
-NOOPTCFLAGS = -pipe -fPIC ${CDEBUGFLAGS} ${INCDIR}
-CFLAGS = ${OPTFLAGS} ${NOOPTCFLAGS}
+NOOPTCFLAGS = -fPIC ${CDEBUGFLAGS} ${INCDIR}
+CFLAGS += ${OPTFLAGS} ${NOOPTCFLAGS}
 LIBS =
 
 ifeq (${METAVM}, yes)