--- Makefile.orig	2011-07-01 08:24:26.000000000 -0400
+++ Makefile	2011-07-01 08:24:53.000000000 -0400
@@ -2,11 +2,11 @@
 all:	$(PROGS)
 
 conv_fn.o:	conv_fn.cc
-	g++ -c conv_fn.cc
+	${CXX} -c conv_fn.cc
 
 locator:	locator.cc conv_fn.o
-	g++ -c locator.cc
-	g++ -o locator locator.o conv_fn.o
+	${CXX} -c locator.cc
+	${CXX} -o locator locator.o conv_fn.o
 
 clean::
 	rm -f *~ *.o $(PROGS)