Removing dead code per review by James Carlson

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 22837c50415e69a6e1a576b97298e741080861f2..f5e584845c2fa672a3490747343a18dfff01d988 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -8,10 +8,13 @@ CC=$(CROSS_COMPILE)@CC@
 COPTS=@CFLAGS@
 
 # Default installation locations
-DESTDIR = $(INSTROOT)@DESTDIR@
+PREFIX = @DESTDIR@
+DESTDIR = $(INSTROOT)$(PREFIX)
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
-INCDIR = $(DESTDIR)/include
+INCDIR = $(INSTROOT)@INCDIR@
+LIBDIR = $(INSTROOT)@LIBDIR@
+PKGCONFDIR = $(LIBDIR)/pkgconfig
 
 TARGETS = pppd
 
@@ -80,7 +83,8 @@ PLUGIN=y
 #USE_SRP=y
 
 # Use libutil; test if logwtmp is declared in <utmp.h> to detect
-ifeq ($(shell echo '\#include <utmp.h>' | $(CC) -E - 2>/dev/null | grep -q logwtmp && echo yes),yes)
+UTMPHEADER = "\#include <utmp.h>"
+ifeq ($(shell echo $(UTMPHEADER) | $(CC) -E - 2>/dev/null | grep -q logwtmp && echo yes),yes)
 USE_LIBUTIL=y
 endif
 
@@ -105,6 +109,8 @@ CFLAGS   += -DMSLANMAN=1
 endif
 ifdef MPPE
 CFLAGS   += -DMPPE=1
+PPPDOBJS += mppe.o
+PPPDSRC  += mppe.c
 HEADERS  += mppe.h
 endif
 endif
@@ -139,23 +145,23 @@ PPPDOBJS += eap-tls.o
 endif
 
 ifdef HAS_SHADOW
-CFLAGS   += -DHAS_SHADOW
+CFLAGS   += -DHAVE_SHADOW_H
 #LIBS     += -lshadow $(LIBS)
 endif
 
-ifeq ($(shell echo '\#include <crypt.h>' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes)
+CRYPTHEADER = "\#include <crypt.h>"
+ifeq ($(shell echo $(CRYPTHEADER) | $(CC) -E - >/dev/null 2>&1 && echo yes),yes)
 CFLAGS  += -DHAVE_CRYPT_H=1
 LIBS   += -lcrypt
 endif
 
 ifdef USE_LIBUTIL
-CFLAGS += -DHAVE_LOGWTMP=1
+CFLAGS += -DHAVE_UTMP_H=1
 LIBS   += -lutil
 endif
 
 ifdef NEEDDES
 ifndef USE_CRYPT
-CFLAGS   += -I$(shell $(CC) --print-sysroot)/usr/include/openssl
 NEEDCRYPTOLIB = y
 else
 CFLAGS   += -DUSE_CRYPT=1
@@ -237,12 +243,15 @@ INSTALL= install
 all: $(TARGETS)
 
 install: pppd
-       mkdir -p $(BINDIR) $(MANDIR)
+       $(INSTALL) -d $(BINDIR)
+       $(INSTALL) -d $(MANDIR)
+       $(INSTALL) -d $(PKGCONFDIR)
        $(EXTRAINSTALL)
-       $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
+       $(INSTALL) -c -m 755 pppd $(BINDIR)/pppd
        if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
          chmod o-rx,u+s $(BINDIR)/pppd; fi
-       $(INSTALL) -c -m 444 pppd.8 $(MANDIR)
+       $(INSTALL) -c -m 644 pppd.pc $(PKGCONFDIR)
+       $(INSTALL) -c -m 644 pppd.8 $(MANDIR)
 
 pppd: $(PPPDOBJS)
        $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_PLUGIN) -o pppd $(PPPDOBJS) $(LIBS)