--- System/ARules.FreeBSD.orig	Fri Sep 11 04:12:51 1998
+++ System/ARules.FreeBSD	Sat Oct 14 04:54:12 2000
@@ -25,19 +25,19 @@
 CPUm=$(shell uname -m)
 
 ## CPU options (currently only intel x86)
-CPUi386=-O3
-CPUi486=-m486 -O3 -DBSTRING
-CPUi586=-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2 -O3 -DBSTRING
-CPUi686=-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2 -O3 -DBSTRING
+CPUi386=
+CPUi486=-m486 -DBSTRING
+CPUi586=-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2 -DBSTRING
+CPUi686=-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2 -DBSTRING
 
 ## set CPU options and optimize
 CPU=$(CPU$(CPUm))
 
 ## additional include paths
-INCLUDES=-I$(TOPDIR)/include -I/usr/openwin/include -I/usr/local/include -I$(INCLUDESDIR)
+INCLUDES=-I$(TOPDIR)/include -I$(INCLUDESDIR)
 
 ## Flags for compiler AND linker
-BOTH=
+BOTH=%%CXXFLAGS%%
 
 ## warnings
 WARNS=-Winline -Wuninitialized -Wunused -Wreturn-type -Wreorder
@@ -48,7 +48,7 @@
 CC_OPTIONS=$(CPU) $(WARNS) $(INCLUDES) $(DEFINES)
 
 ## linker flags
-LD_OPTIONS=-L/usr/X11/lib -L/usr/lib -L$(LIBSDIR)
+LD_OPTIONS=-L$(LIBSDIR)
 
 ## linker libraries
 SHLIBS=-lX11 -lm
@@ -86,6 +86,6 @@
 LIBNAME=libXclasses.so.
 ARNAME=libXclasses.a
 
-CC=g++
-LD=gcc
+CC=%%CXX%%
+LD=%%CXX%%
 LDCONFIG=ldconfig -m $(LIBSDIR)