--- Makefile.in.orig	Tue Apr 30 00:10:21 2002
+++ Makefile.in	Thu May  1 23:26:55 2003
@@ -13,8 +13,8 @@
 # Compiler and flags
 # DEFS should include -Dacceptarg3_t=int (replace with the correct data type)
 CXX = @CXX@
-CXXFLAGS = @extracxxflags@ @DEFS@ -O2 -I@includedir@ -I$(XROOT)/include -I/usr/local/include -I/usr/contrib/include -c
-LDFLAGS = @extraldflags@ -L@libdir@ -L$(XROOT)/lib -L/usr/local/lib -L/usr/contrib/lib -o
+CXXFLAGS = @CXXFLAGS@ @extracxxflags@ @DEFS@ -I$(XROOT)/include @CPPFLAGS@ -c
+LDFLAGS = @LDFLAGS@ @extraldflags@ -L$(XROOT)/lib -o
 
 # Extra switches and libs determined by configure.in
 extraswitches=@extraswitches@
