pppd: Fix SIGSEGV in EAP-TLS code when TLS verify method is not specified

[ppp.git] / linux / Makefile.top

diff --git a/linux/Makefile.top b/linux/Makefile.top
index 1ebb8586c68126ae942446ea68023b6551afd9d0..894f8f32c9e4bd4284ad614382f6b5f2b29a959a 100644 (file)
--- a/linux/Makefile.top
+++ b/linux/Makefile.top
@@ -1,29 +1,35 @@
 # PPP top-level Makefile for Linux.
 
-
-BINDIR = /usr/sbin
-MANDIR = /usr/man
-ETCDIR = /etc/ppp
+DESTDIR = $(INSTROOT)@DESTDIR@
+BINDIR = $(DESTDIR)/sbin
+INCDIR = $(DESTDIR)/include
+MANDIR = $(DESTDIR)/share/man
+ETCDIR = $(INSTROOT)@SYSCONF@/ppp
 
 # uid 0 = root
-INSTALL= install -o 0 -g daemon
+INSTALL= install
 
 all:
        cd chat; $(MAKE) $(MFLAGS) all
+       cd pppd/plugins; $(MAKE) $(MFLAGS) all
        cd pppd; $(MAKE) $(MFLAGS) all
        cd pppstats; $(MAKE) $(MFLAGS) all
        cd pppdump; $(MAKE) $(MFLAGS) all
 
-install: $(BINDIR) $(MANDIR)/man8 install-progs install-etcppp
+install: $(BINDIR) $(MANDIR)/man8 install-progs install-devel
 
 install-progs:
-       cd chat; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) $(MFLAGS) install
-       cd pppd; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) $(MFLAGS) install
-       cd pppstats; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) $(MFLAGS) install
-       cd pppdump; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) $(MFLAGS) install
+       cd chat; $(MAKE) $(MFLAGS) install
+       cd pppd/plugins; $(MAKE) $(MFLAGS) install
+       cd pppd; $(MAKE) $(MFLAGS) install
+       cd pppstats; $(MAKE) $(MFLAGS) install
+       cd pppdump; $(MAKE) $(MFLAGS) install
 
 install-etcppp: $(ETCDIR) $(ETCDIR)/options $(ETCDIR)/pap-secrets \
-       $(ETCDIR)/chap-secrets
+       $(ETCDIR)/chap-secrets $(ETCDIR)/eaptls-server $(ETCDIR)/eaptls-client
+
+install-devel:
+       cd pppd; $(MAKE) $(MFLAGS) install-devel
 
 $(ETCDIR)/options:
        $(INSTALL) -c -m 644 etc.ppp/options $@
@@ -31,6 +37,10 @@ $(ETCDIR)/pap-secrets:
        $(INSTALL) -c -m 600 etc.ppp/pap-secrets $@
 $(ETCDIR)/chap-secrets:
        $(INSTALL) -c -m 600 etc.ppp/chap-secrets $@
+$(ETCDIR)/eaptls-server:
+       $(INSTALL) -c -m 600 etc.ppp/eaptls-server $@
+$(ETCDIR)/eaptls-client:
+       $(INSTALL) -c -m 600 etc.ppp/eaptls-client $@
 
 $(BINDIR):
        $(INSTALL) -d -m 755 $@
@@ -44,6 +54,7 @@ clean:
        rm -f `find . -name 'core' -print`
        rm -f `find . -name '*~' -print`
        cd chat; $(MAKE) clean
+       cd pppd/plugins; $(MAKE) clean
        cd pppd; $(MAKE) clean
        cd pppstats; $(MAKE) clean
        cd pppdump; $(MAKE) clean
@@ -51,5 +62,9 @@ clean:
 dist-clean:    clean
        rm -f Makefile `find . -name Makefile -print`
 
-kernel:
-       cd linux; ./kinstall.sh
+#kernel:
+#      cd linux; ./kinstall.sh
+
+# no tests yet, one day...
+installcheck:
+       true