--- mongrel2-v1.9.1.orig/Makefile	2014-04-09 18:13:27.000000000 +0200
+++ mongrel2-v1.9.1/Makefile	2015-05-05 21:49:42.000000000 +0200
@@ -1,6 +1,7 @@
-CFLAGS=-g -O2 -Wall -Wextra -Isrc -Isrc/polarssl/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
+CFLAGS?=
+CFLAGS+=-Wall -Wextra -Isrc -Isrc/polarssl/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
 LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS)
-PREFIX?=/usr/local
+PREFIX?=/usr
 
 get_objs = $(addsuffix .o,$(basename $(wildcard $(1))))
 
@@ -18,7 +19,7 @@ MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTF
 ifdef $($(shell sh init.sh))
 endif
 
-all: bin/mongrel2 tests m2sh procer
+all: bin/mongrel2
 
 dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
 dev: all
@@ -106,10 +107,8 @@ install: all
 	install bin/mongrel2 $(DESTDIR)/$(PREFIX)/bin/ \
 	    || ( install -d $(DESTDIR)/$(PREFIX)/bin/ \
 	        && install bin/mongrel2 $(DESTDIR)/$(PREFIX)/bin/ )
-	${MAKE} ${MAKEOPTS} -C tools/m2sh install
 	${MAKE} ${MAKEOPTS} -C tools/config_modules install
 	${MAKE} ${MAKEOPTS} -C tools/filters install
-	${MAKE} ${MAKEOPTS} -C tools/procer install
 
 examples/python/mongrel2/sql/config.sql: src/config/config.sql src/config/mimetypes.sql
 	cat src/config/config.sql src/config/mimetypes.sql > $@