2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dea783b5..c9341a06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-12-03  Kaz Kylheku  <kkylheku@gmail.com>
 
+	* Makefile (CFLAGS): Better test for g++, when removing
+	warning options not appropriate for g++. Sometimes
+	g++ may be called something that dosn't end in g++,
+	like g++4.
+
+2009-12-03  Kaz Kylheku  <kkylheku@gmail.com>
+
 	Fix for failing test suite on MIPS machine, due to
 	gc failing to mark a local variable in txr_main.
 
diff --git a/Makefile b/Makefile
index 383ceb65..5713e0c1 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ CFLAGS := -I. -I$(top_srcdir) $(LANG_FLAGS) $(DIAG_FLAGS) \
           $(OPT_FLAGS) $(DBG_FLAGS) $(PLATFORM_FLAGS)
 CFLAGS := $(filter-out $(REMOVE_FLAGS),$(CFLAGS))
 
-ifeq ($(patsubst %g++,y,$(CC)),y)
+ifneq ($(subst g++,@,$(notdir $(CC))),$(notdir $(CC)))
 CFLAGS := $(filter-out -Wmissing-prototypes -Wstrict-prototypes,$(CFLAGS))
 endif