--- indep-utils/cmu-scen-gen/setdest/Makefile.in.orig	Fri Sep 16 05:05:40 2005
+++ indep-utils/cmu-scen-gen/setdest/Makefile.in	Sat Oct 13 22:22:22 2007
@@ -48,7 +48,7 @@ prefix	= @prefix@
 # Pathname of directory to install the binary
 BINDEST	= @prefix@/bin
 
-CCX = @CXX@
+CXX = @CXX@
 CC = @CC@
 MKDEP	= ../../../conf/mkdep
 
@@ -66,19 +66,19 @@ install: setdest calcdest
 	$(INSTALL) -m 555 -o bin -g bin calcdest $(DESTDIR)$(BINDEST)
 
 setdest: rng.o setdest.o
-	$(CCX) -o setdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
+	$(CXX) -o setdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
 	$(LIBS)
 
 calcdest: rng.o calcdest.o
-	$(CCX) -o calcdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
+	$(CXX) -o calcdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
 	$(LIBS)
 
 rng.o:
 	@rm -f $@
-	$(CCX) -c $(DEFINE) -I../../.. -o $@ ../../../tools/rng.cc
+	$(CXX) -c $(DEFINE) -I../../.. -o $@ ../../../tools/rng.cc
 
 setbox: setbox.o
-	$(CCX) -o setbox $@.o $(LDFLAGS) $(CFLAGS) $(LIBS)
+	$(CXX) -o setbox $@.o $(LDFLAGS) $(CFLAGS) $(LIBS)
 
 clean:
 	@rm -f setdest setbox *.o *.core
@@ -86,5 +86,5 @@ clean:
 .SUFFIXES: .cc
 
 .cc.o:
-	$(CCX) -c $(DEFINE) $(CFLAGS) -o $@ $*.cc
+	$(CXX) -c $(DEFINE) $(CFLAGS) -o $@ $*.cc