Simplified and cleaned up the radiusclient implementation, and

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index b52a1292e179298c98ea8f8725b237bce0842abe..e7e52b84c722a225f5dbd243172ead87568369cf 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,12 +1,13 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.60 2003/11/27 21:55:19 paulus Exp $
+# $Id: Makefile.linux,v 1.66 2004/11/13 12:02:22 paulus Exp $
 #
 
 # Default installation locations
-BINDIR = $(DESTDIR)/usr/sbin
-MANDIR = $(DESTDIR)/usr/man
-INCDIR = $(DESTDIR)/usr/include
+DESTDIR = @DESTDIR@
+BINDIR = $(DESTDIR)/sbin
+MANDIR = $(DESTDIR)/share/man/man8
+INCDIR = $(DESTDIR)/include
 
 TARGETS = pppd
 
@@ -152,9 +153,9 @@ endif
 # TDB
 ifdef USE_TDB
        CFLAGS += -DUSE_TDB=1
-       PPPDSRCS += tdb.c
-       PPPDOBJS += tdb.o
-       HEADERS += tdb.h
+       PPPDSRCS += tdb.c spinlock.c
+       PPPDOBJS += tdb.o spinlock.o
+       HEADERS += tdb.h spinlock.h
 endif
 
 # Lock library binary for Linux is included in 'linux' subdirectory.
@@ -170,8 +171,10 @@ LIBS       += -ldl
 endif
 
 ifdef FILTER
+ifneq ($(wildcard /usr/include/pcap-bpf.h),)
 LIBS    += -lpcap
-CFLAGS  += -DPPP_FILTER -I/usr/include/pcap
+CFLAGS  += -DPPP_FILTER
+endif
 endif
 
 ifdef HAVE_INET6
@@ -192,7 +195,7 @@ ifdef MAXOCTETS
      CFLAGS += -DMAXOCTETS
 endif
 
-INSTALL= install -o root
+INSTALL= install
 
 all: $(TARGETS)
 
@@ -202,7 +205,7 @@ install: pppd
        $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
        if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
          chmod o-rx,u+s $(BINDIR)/pppd; fi
-       $(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
+       $(INSTALL) -c -m 444 pppd.8 $(MANDIR)
 
 pppd: $(PPPDOBJS)
        $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)