--- Makefile.orig	Sat Sep 25 08:29:04 1999
+++ Makefile	Fri Feb  4 19:58:09 2000
@@ -1,13 +1,15 @@
 # "Artistic Style" Makefile
 
-CPPFLAGS = -O2 -W
+CXX?=	g++
+CPPFLAGS = ${CXXFLAGS} 
+CPPFLAGS ?= -O2
 OBJS = ASResource.o ASBeautifier.o ASFormatter.o astyle_main.o
 
 astyle: $(OBJS)
-	g++ $(CPPFLAGS) -o astyle  $(OBJS)
+	$(CXX) $(CPPFLAGS) -o astyle  $(OBJS)
 
 .cpp.o:
-	g++ $(CPPFLAGS) -c $<
+	$(CXX) $(CPPFLAGS) -c $<
 .SUFFIXES: .cpp .c .o
 
 clean: