--- Makefile.orig	Mon Dec 12 18:00:00 2005
+++ Makefile	Mon May  1 11:07:46 2006
@@ -39,27 +39,27 @@
 LOGFAC="LOG_DAEMON"
 LOGSET=-DLOGOPT=${LOGOPT} -DLOGFAC=${LOGFAC}
 LANG=en
-CC=gcc
+CC?=gcc
 SYSINS=install
 #CFLAGS=-Wall -O3 -march=i686 ${LOGSET}
-CFLAGS=-Wall -O2 $(LOGSET)
+CFLAGS=-Wall -O2 $(LOGSET) -I${PREFIX}/include -I/usr/local/include
 
 #ifdef DEMIME :)
-LDFLAGS=-L. -lripmime -lpcre -lssl -lcrypto #-static
+LDFLAGS=-L. -lripmime -lpcre -lssl -lcrypto ${_LDFLAGS} #-static
 #else
 #LDFLAGS=-L. -lpcre -lssl -lcrypto
 #endif :)
 
-PREFIX=/usr
+PREFIX=/usr/local
 DESTDIR=
 #MANDIR=$(PREFIX)/share/man/man8
-MANDIR=$(PREFIX)/man/man8
+MANDIR?=$(PREFIX)/man/man8
 piddir=/var/run/$(PROGS)
 datadir=/var/spool/$(PROGS)
 notify=/var/spool/$(PROGS)/notify
-userdir=/etc/$(PROGS)
-docdir=/usr/doc/$(DISTNAME)
-user=mail:mail
+userdir=$(PREFIX)/etc/$(PROGS)
+docdir=$(PREFIX)/share/doc/$(DISTNAME)
+user=mailnull:mail
 # End user options
 
 OBJECTS=getlinep3.o getline_ssl.o parsefile.o p3scan.o \
@@ -85,7 +85,7 @@
 dep depend .dep:
 	@echo "creating depencies"
 	rm -f .tmp.dep
-	@find -maxdepth 1 -name "*.c" -print0 | xargs -n 1 -0rt $(CC) -M $(CFLAGS)  >>.tmp.dep
+	@find . -maxdepth 1 -name "*.c" -print0 | xargs -n 1 -0rt $(CC) -M $(CFLAGS)  >>.tmp.dep
 	mv .tmp.dep .dep
 
 install: p3scan
@@ -163,8 +163,8 @@
 
 fulltags:
 	@#VIM Users know why! *g*
-	find -maxdepth 1 -name "*.c" -print0 | xargs -n 1 -0r $(CC) -M -H $(CFLAGS) 2>.totag >/dev/null
-	find -maxdepth 1 -name "*.c" -print0 | xargs -n 1 -0r echo >>.totag
+	find . -maxdepth 1 -name "*.c" -print0 | xargs -n 1 -0r $(CC) -M -H $(CFLAGS) 2>.totag >/dev/null
+	find . -maxdepth 1 -name "*.c" -print0 | xargs -n 1 -0r echo >>.totag
 	cat .totag | sed "s/^[[:space:]]*//" | grep -v "^$(CC)" | sort | uniq >.totag
 	ctags --c-types=+c+p+f+x -L .totag .
 	rm -f .totag