Index: src/Makefile
--- src/Makefile.orig	2011-11-28 11:22:08.000000000 +0100
+++ src/Makefile	2011-11-28 19:42:28.000000000 +0100
@@ -25,11 +25,11 @@
 endif
 
 ifeq ($(uname_S),SunOS)
-  CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
+  CFLAGS?=-std=c99 $(OPTIMIZATION) -D__EXTENSIONS__ -D_XPG6
   CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
   DEBUG?=-g -ggdb
 else
-  CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
+  CFLAGS?=-std=c99 $(OPTIMIZATION) $(ARCH) $(PROF)
   CCLINK?=-lm -pthread
   DEBUG?=-g -rdynamic -ggdb
 endif
@@ -205,7 +205,7 @@
 	./redis-benchmark
 
 log:
-	git log '--pretty=format:%ad %s (%cn)' --date=short > ../Changelog
+	cat /dev/null > ../Changelog
 
 32bit:
 	@echo ""
Index: src/debug.c
--- src/debug.c.orig	2011-11-28 11:22:08.000000000 +0100
+++ src/debug.c	2011-11-28 19:46:44.000000000 +0100
@@ -337,7 +337,9 @@
 }
 
 void _redisAssert(char *estr, char *file, int line) {
+#ifdef HAVE_BACKTRACE
     bugReportStart();
+#endif
     redisLog(REDIS_WARNING,"=== ASSERTION FAILED ===");
     redisLog(REDIS_WARNING,"==> %s:%d '%s' is not true",file,line,estr);
 #ifdef HAVE_BACKTRACE
@@ -350,7 +352,9 @@
 }
 
 void _redisPanic(char *msg, char *file, int line) {
+#ifdef HAVE_BACKTRACE
     bugReportStart();
+#endif
     redisLog(REDIS_WARNING,"!!! Software Failure. Press left mouse button to continue");
     redisLog(REDIS_WARNING,"Guru Meditation: %s #%s:%d",msg,file,line);
 #ifdef HAVE_BACKTRACE
Index: src/mkreleasehdr.sh
--- src/mkreleasehdr.sh.orig	2011-11-28 11:22:08.000000000 +0100
+++ src/mkreleasehdr.sh	2011-11-28 19:42:28.000000000 +0100
@@ -1,6 +1,6 @@
 #!/bin/sh
 GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
-GIT_DIRTY=`git diff 2> /dev/null | wc -l`
+GIT_DIRTY=`(git diff 2> /dev/null) | wc -l`
 test -f release.h || touch release.h
 (cat release.h | grep SHA1 | grep $GIT_SHA1) && \
 (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate