Add $(INSTDIR) to installation paths in Linux makefiles.

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index aaf5c31322cf36277103bbc1fbf8644334bf96aa..af8f6c615dc37c280adfbb48a9bb1d5dba30e52c 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,10 +1,10 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.65 2004/11/01 03:49:20 paulus Exp $
+# $Id: Makefile.linux,v 1.69 2006/06/04 05:07:46 paulus Exp $
 #
 
 # Default installation locations
-DESTDIR = @DESTDIR@
+DESTDIR = $(INSTROOT)@DESTDIR@
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
 INCDIR = $(DESTDIR)/include
@@ -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
@@ -118,9 +118,7 @@ CFLAGS   += -DHAS_SHADOW
 endif
 
 ifneq ($(wildcard /usr/include/crypt.h),)
-CFLAGS   += -DHAVE_CRYPT_H=1
-endif
-ifneq ($(wildcard /usr/lib/libcrypt.*),)
+CFLAGS  += -DHAVE_CRYPT_H=1
 LIBS   += -lcrypt
 endif
 
@@ -153,9 +151,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.