Index: Makefile
--- Makefile.orig	2007-05-26 11:52:33 +0200
+++ Makefile	2007-05-26 18:54:15 +0200
@@ -40,42 +40,31 @@
 	-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \
 	-DHAS_RFC2553=$(HAS_RFC2553)
 
-PCAP_LIB=/usr/local/lib/libpcap.a
-#PCAP_LIB=-lpcap
+PCAP_LIB?=/usr/local/lib/libpcap.a
 
 ifeq ($(shell uname), FreeBSD)
    PTHREAD_LIBS?=-pthread
-   CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf $(PTHREAD_CFLAGS) \
+   CFLAGS+=$(PTHREAD_CFLAGS) \
          -D_FILE_OFFSET_BITS=64
-   LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS)
+   LIBS+=-L. -lelf $(PTHREAD_LIBS)
 else
 ifeq ($(shell uname), Linux)
    PTHREAD_LIBS?=-lpthread
 #   PCAP_LIB=-lpcap
-   CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS)
-   LIBS=-L/usr/lib -L. /usr/lib/libelf.a $(PTHREAD_LIBS)
-   DESTDIR=/usr
+   CFLAGS+=-mdynamic-no-pic $(PTHREAD_CFLAGS)
+   LIBS+=-lelf $(PTHREAD_LIBS)
 else
 ifeq ($(shell uname -s), Darwin)
-   CFLAGS+=-I/usr/local/include -mdynamic-no-pic -D_FILE_OFFSET_BITS=64
-   LIBS=-L/usr/local/lib -L. -lelf -lpthread
+   CFLAGS+=-mdynamic-no-pic -D_FILE_OFFSET_BITS=64
+   LIBS+=-lelf -lpthread
 else
 ifeq ($(shell uname -s), SunOS)
-   CFLAGS+=-I/usr/local/include -DINADDR_NONE=0xFFFFFFFF \
-	-I /opt/csw/include -DSUNOS
-   LIBS=-L/usr/local/lib -L. -lelf -lpthread -L/opt/csw/lib \
+   CFLAGS+=-DINADDR_NONE=0xFFFFFFFF \
+	-DSUNOS
+   LIBS+=-lelf -lpthread \
 	-lsocket -lnsl -lresolv
-   PCAP_LIB=/opt/csw/lib/libpcap.a
-else
-ifeq ($(shell uname -o), Cygwin)
-   CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf -DCYGWIN \
-	-D_FILE_OFFSET_BITS=64
-   LIBS=-L/usr/local/lib -L. -lelf -lpthread
-   PCAP_LIB=-lpacket -lwpcap
 else
-   CFLAGS+=-I/usr/include/libelf -D_FILE_OFFSET_BITS=64
-   LIBS=-L. /usr/lib/libelf.a -lpthread
-endif
+   LIBS+=-lpthread
 endif
 endif
 endif
