X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2FMakefile.linux;h=d75b20c7086988d717768b85beb0815599233b0b;hb=0296079a6611dd4150cf7dc946828f3d3f9def7a;hp=2cdfe9e5cc2af7e3ba103793c6027aa5120bf521;hpb=93707a531320fbf398fdb5ffa69a86af092c798c;p=ppp.git

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 2cdfe9e..d75b20c 100644
--- 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.67 2005/07/10 11:19:10 paulus Exp $
 #
 
 # Default installation locations
 DESTDIR = @DESTDIR@
 BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/man/man8
+MANDIR = $(DESTDIR)/share/man/man8
 INCDIR = $(DESTDIR)/include
 
 TARGETS = pppd
@@ -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)