--- Makefile.orig	Mon Apr 28 20:40:22 2003
+++ Makefile	Mon Apr 28 20:41:03 2003
@@ -26,7 +26,7 @@
 $(OBJECTS): config/config.me $(ALLMAKEFILES)
 
 $(BINARY): $(OBJECTS) $(ALLMAKEFILES)
-	g++ $(CFLAGS) $(CXXFLAGS) -o $(BINARY) $(OBJECTS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $(BINARY) $(OBJECTS)
 # Here is a trick on how to get fastdep linking on older cygwins.
 # It's probably also needed to get it working on VC 6.0.
 # However, since I am still reworking the build environment for now,
@@ -38,7 +38,7 @@
 #endif
 
 .cc.o: $(ALLMAKEFILES)
-	g++ $(CFLAGS) $(CXXFLAGS) -c $< -o $@
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
 
 clean:
 	-rm -f $(OBJECTS) $(BINARY) .depends-all