David Sommerseth a095bb4
--- src/Makefile.upstream	2012-02-27 11:26:33.399816815 +0100
David Sommerseth a095bb4
+++ src/Makefile	2012-02-27 11:29:11.478811550 +0100
David Sommerseth a095bb4
@@ -1,8 +1,8 @@
David Sommerseth a095bb4
 DESTDIR =
David Sommerseth a095bb4
-PREFIX = /usr/local
David Sommerseth a095bb4
+PREFIX = /usr
David Sommerseth a095bb4
 BINDIR = $(PREFIX)/bin
David Sommerseth a095bb4
 SHAREDIR = $(PREFIX)/share/imapfilter
David Sommerseth a095bb4
-MANDIR = $(PREFIX)/man
David Sommerseth a095bb4
+MANDIR = $(PREFIX)/share/man
David Sommerseth a095bb4
 
David Sommerseth a095bb4
 MYCFLAGS =
David Sommerseth a095bb4
 MYLDFLAGS =
David Sommerseth a095bb4
@@ -16,7 +16,7 @@
David Sommerseth a095bb4
 LIBSSL = -lssl
David Sommerseth a095bb4
 LIBCRYPTO = -lcrypto
David Sommerseth a095bb4
 
David Sommerseth a095bb4
-CFLAGS = -Wall -O -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS) $(MYCFLAGS)
David Sommerseth a095bb4
+CFLAGS += -Wall -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS)
David Sommerseth a095bb4
 LDFLAGS = $(LIBDIRS) $(MYLDFLAGS)
David Sommerseth a095bb4
 LIBS = -lm $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS)
David Sommerseth a095bb4