X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2FMakefile.linux;h=d75b20c7086988d717768b85beb0815599233b0b;hb=5628c6cdf469989897d40a1820d725806a1fcbf2;hp=a5df637c69937a28e7d7550d6ed68c1c84090a4f;hpb=8dab7e1cb378a55b57a7bca6bc66a7ecc091d41f;p=ppp.git

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index a5df637..d75b20c 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,6 +1,6 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.63 2004/10/31 21:27:24 paulus Exp $
+# $Id: Makefile.linux,v 1.67 2005/07/10 11:19:10 paulus Exp $
 #
 
 # Default installation locations
@@ -79,7 +79,7 @@ INCLUDE_DIRS= -I../include
 
 COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
 
-CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
+CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
 
 ifdef CHAPMS
 CFLAGS   += -DCHAPMS=1
@@ -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)