New version of TDB code, borrowed from samba.

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 2cdfe9e5cc2af7e3ba103793c6027aa5120bf521..e7e52b84c722a225f5dbd243172ead87568369cf 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,12 +1,12 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.62 2004/10/29 00:12:27 paulus Exp $
+# $Id: Makefile.linux,v 1.66 2004/11/13 12:02:22 paulus Exp $
 #
 
 # Default installation locations
 DESTDIR = @DESTDIR@
 BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/man/man8
+MANDIR = $(DESTDIR)/share/man/man8
 INCDIR = $(DESTDIR)/include
 
 TARGETS = pppd
@@ -153,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.
@@ -171,9 +171,11 @@ LIBS       += -ldl
 endif
 
 ifdef FILTER
+ifneq ($(wildcard /usr/include/pcap-bpf.h),)
 LIBS    += -lpcap
 CFLAGS  += -DPPP_FILTER
 endif
+endif
 
 ifdef HAVE_INET6
      PPPDSRCS += ipv6cp.c eui64.c
@@ -193,7 +195,7 @@ ifdef MAXOCTETS
      CFLAGS += -DMAXOCTETS
 endif
 
-INSTALL= install -o root
+INSTALL= install
 
 all: $(TARGETS)