--- Makefile.orig	2011-02-21 00:17:16.334746748 +0200
+++ Makefile	2011-02-21 00:19:16.504881112 +0200
@@ -2,8 +2,6 @@
 SHELL = /bin/sh
 
 # Compiler to use
-CC = g++
-CFLAGS = -O2
 #CFLAGS += -g -Wall
 #CFLAGS += -ansi
 #CFLAGS += -pedantic
@@ -12,7 +10,7 @@
 # Comment out CFLAGS line below for compatability mode for 32bit file sizes
 # (less than 2GB) and systems that have compilers that treat int as 64bit
 # natively (ie: modern AIX)
-CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+CXXFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 
 # Uncomment CFLAGS line below if you want to compile pbzip2 without load
 # average support for systems that do not support it
@@ -22,10 +20,10 @@
 #CFLAGS += -DPBZIP_DEBUG
 
 # Comment out CFLAGS line below to disable pthread semantics in code
-CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
+CXXFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 
 # Comment out CFLAGS line below to disable Thread stack size customization
-CFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
+CXXFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
 
 # Comment out CFLAGS line below to explicity set ignore trailing garbage
 # default behavior: 0 - disabled; 1 - enabled (ignore garbage by default)
@@ -34,11 +32,11 @@
 #CFLAGS += -DIGNORE_TRAILING_GARBAGE=1
 
 # On some compilers -pthreads
-CFLAGS += -pthread
+CXXFLAGS += -pthread
 
 # External libraries
-LDFLAGS = -lbz2
-LDFLAGS += -lpthread
+LIBS = -lbz2
+LIBS += -lpthread
 
 # Where you want pbzip2 installed when you do 'make install'
 PREFIX = /usr
@@ -47,11 +45,11 @@
 
 # Standard pbzip2 compile
 pbzip2: pbzip2.cpp BZ2StreamScanner.cpp ErrorContext.cpp
-	$(CC) $(CFLAGS) $^ -o pbzip2 $(LDFLAGS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2
 
 # Choose this if you want to compile in a static version of the libbz2 library
 pbzip2-static: pbzip2.cpp BZ2StreamScanner.cpp ErrorContext.cpp libbz2.a
-	$(CC) $(CFLAGS) $^ -o pbzip2 -I. -L. $(LDFLAGS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 -I. -L.
 
 # Install the binary pbzip2 program and man page
 install: pbzip2