$FreeBSD$

--- GNUmakefile.in.orig	Mon Sep  3 15:45:14 2001
+++ GNUmakefile.in	Mon Sep 10 14:54:24 2001
@@ -51,11 +51,10 @@
 INCDIR = -I${J_INCDIR1} -I${J_INCDIR1}/${J_INCDIR_MD} -I${J_INCDIR2} -I${J_INCDIR2}/${J_INCDIR_MD} -I${OBJDIR} -I/usr/local/include
 
 CFLAGS_COMMON =# -g -DCOMPILE_DEBUG# -DRUNTIME_DEBUG
-COPTFLAGS = -O2
 CFLAGS_OPT =
 CFLAGS_DBG = -g -DDEBUG -DJCOV
-NOOPTCFLAGS = @ac_cflags@ -pipe ${CFLAGS_${VARIANT}} ${CFLAGS_COMMON} ${INCDIR}
-CFLAGS = ${COPTFLAGS} ${NOOPTCFLAGS}
+NOOPTCFLAGS = @ac_cflags@ ${CFLAGS_${VARIANT}} ${CFLAGS_COMMON} ${INCDIR}
+CFLAGS += ${COPTFLAGS} ${NOOPTCFLAGS}
 LIBS =
 
 ifeq (${METAVM}, yes)