--- Makefile.orig      Tue Jul 26 13:25:59 2005
+++ Makefile   Tue Jul 26 15:00:51 2005
@@ -34,20 +34,20 @@
 LOGFAC="LOG_DAEMON"
 LOGSET=-DLOGOPT=${LOGOPT} -DLOGFAC=${LOGFAC}
 LANG=en
-CC=gcc
+CC?=gcc
 SYSINS=ginstall
-CFLAGS=-Wall -O2 ${LOGSET}
-LDFLAGS=-L. -lripmime -lpcre #-static
+CFLAGS+=-Wall -O2 ${LOGSET} -I${PREFIX}/include -I/usr/local/include
+LDFLAGS+=-L. -lripmime -lpcre ${_LDFLAGS} #-static
 
 PREFIX=/usr
 #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
-user=mail.mail
-userdir=/etc/$(PROGS)
-docdir=/usr/doc/$(DISTNAME)
+user=mail:mail
+userdir=/usr/local/etc/$(PROGS)
+docdir=/usr/local/doc/$(DISTNAME)
 # End user options
 
 OBJECTS=getline.o parsefile.o p3scan.o \
@@ -71,8 +71,8 @@
 
 dep depend .dep:
 	@echo "creating depencies"
-	rm .tmp.dep -f
-	@find -name "*.c"   -maxdepth 1 -print0 | xargs -n 1 -0rt $(CC) -M $(CFLAGS)  >>.tmp.dep
+	rm -f .tmp.dep
+	@find . -name "*.c"   -maxdepth 1 -print0 | xargs -n 1 -0t $(CC) -M $(CFLAGS)  >>.tmp.dep
 	mv .tmp.dep .dep
 
 install: p3scan
@@ -148,9 +148,9 @@
 
 fulltags:
 	@#VIM Users know why! *g*
-	find -name "*.c" -maxdepth 1 -print0 \
+	find . -name "*.c" -maxdepth 1 -print0 \
 	| xargs -n 1 -0r $(CC) -M -H $(CFLAGS) 2>.totag >/dev/null
-	find -name "*.c" -maxdepth 1 -print0 \
+	find . -name "*.c" -maxdepth 1 -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 .