1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 18b8441..1983148 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,12 @@ BIN_DIR  = ./bin
 
 SRC_DIR  = ./src
 
-CPP = g++
+ifdef CXX
+  CPP = $(CXX)
+  CC = $(CXX)
+else
+  CPP = g++
+endif
 
 ifdef DEBUG
   # development mode
@@ -97,7 +102,6 @@ else
   CPPFLAGS += -static
 endif
 
-
 # all
 OBJS = $(SOURCES:.cpp=.o)
 
@@ -124,7 +128,7 @@ check: fast-check slow-check
 
 clean:
 	rm -rf ${SRC_DIR}/*.o ${SRC_DIR}/*~ *~ $(OUTPUT)
-	rm test/output/*
+	rm -f test/output/*
 
 DIST_COMMON = COPYING.txt README.txt Makefile
 DIST_SUBDIRS = src doc example bin