get files from ../include/linux if not here

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 1bf7b1a85751b9e3b984a5329bb418f469f3e578..8c0ac11531d0156a94d2b259fca75bf986b3c4e1 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,6 +1,6 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.23 1998/02/04 01:39:24 paulus Exp $
+# $Id: Makefile.linux,v 1.28 1999/03/30 06:01:42 paulus Exp $
 #
 
 # Default installation locations
@@ -26,8 +26,8 @@ endif
 
 # CC = gcc
 #
-COPTS = -O2 # -g
-VER = 2.3.3
+COPTS = -O2 -pipe -Wall -g
+VER = 2.3.6
 LIBS =
 
 ifneq ($(wildcard /usr/lib/libcrypt*),)
@@ -36,14 +36,17 @@ endif
 
 # Uncomment the next 2 lines to include support for Microsoft's
 # MS-CHAP authentication protocol.
-#CHAPMS=y
-#USE_CRYPT=y
+CHAPMS=y
+USE_CRYPT=y
+ifneq ($(wildcard /usr/lib/libcrypt*),)
+HAVE_CRYPT_H=y
+endif
+
 
-# The INCLUDE_DIRS must include the standard headers before the local
-# ones. If you just had -I.. then the order would be reversed. So, use
-# the default location for include files first before the .. location.
-#INCLUDE_DIRS= -I/usr/include -I..
-INCLUDE_DIRS=
+HAS_SHADOW=y
+#USE_PAM=y
+
+INCLUDE_DIRS= -I../include
 
 COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE
 
@@ -55,6 +58,9 @@ ifndef USE_CRYPT
 LIBS     := -ldes $(LIBS)
 else
 CFLAGS   += -DUSE_CRYPT=1
+ifneq ($(wildcard /usr/include/crypt.h),)
+CFLAGS   += -DHAVE_CRYPT_H=1
+endif
 endif
 PPPDOBJS += md4.o chap_ms.o
 ifdef MSLANMAN
@@ -64,7 +70,7 @@ endif
 
 ifdef HAS_SHADOW
 CFLAGS   += -DHAS_SHADOW
-LIBS     := -lshadow $(LIBS)
+#LIBS     := -lshadow $(LIBS)
 endif
 
 # For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/.
@@ -81,8 +87,10 @@ endif
 
 install: pppd
        mkdir -p $(BINDIR) $(MANDIR)
-       install -s -c -m 4555 -o root pppd $(BINDIR)/pppd
-       install -c -m 555 -o root pppd.8 $(MANDIR)/man8
+       install -s -c -m 4550 -o root pppd $(BINDIR)/pppd
+       if ! chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
+         chmod o+rx $(BINDIR)/pppd; fi
+       install -c -m 444 -o root pppd.8 $(MANDIR)/man8
 
 pppd: $(PPPDOBJS)
        $(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS)