--- Makefile.in.orig	Mon Dec 20 23:15:05 2004
+++ Makefile.in	Sat Jul 16 23:47:26 2005
@@ -11,8 +11,8 @@
 # DEFS should include -Dacceptarg3_t=int (replace with the correct data type)
 CXX = @CXX@
 CC = @CC@
-CXXFLAGS = @extracxxflags@ @DEFS@ -I@includedir@ -Ilibtcd -I@xroot@/include @normalcxxflags@ -c
-LDFLAGS = @extraldflags@ -L@libdir@ -L@xlibdir@ @normalldflags@ -o
+CXXFLAGS = @CXXFLAGS@ @DEFS@ -I@includedir@ -Ilibtcd -I@xroot@/include @extracxxflags@ -c
+LDFLAGS = @LDFLAGS@ -L@libdir@ -L@xlibdir@ @extraldflags@ -o
 
 # Extra switches and libs determined by configure.in
 extraswitches=@extraswitches@
