Added "install-devel" Makefile target to install pppd headers required to

build pppd plugins.  NOTE: Only works on Linux Makefiles; must be added for
other supported OS's.

diff --git a/linux/Makefile.top b/linux/Makefile.top
index 928800c98d0f1adb669f4b7513705ec2519983e2..6b209dcfed77291a7092643dc0407eafb34668d8 100644 (file)
--- a/linux/Makefile.top
+++ b/linux/Makefile.top
@@ -2,6 +2,7 @@
 
 
 BINDIR = $(DESTDIR)/usr/sbin
+INCDIR = $(DESTDIR)/usr/include
 MANDIR = $(DESTDIR)/usr/man
 ETCDIR = $(DESTDIR)/etc/ppp
 
@@ -15,7 +16,7 @@ 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-etcppp install-devel
 
 install-progs:
        cd chat; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) $(MFLAGS) install
@@ -27,6 +28,9 @@ install-progs:
 install-etcppp: $(ETCDIR) $(ETCDIR)/options $(ETCDIR)/pap-secrets \
        $(ETCDIR)/chap-secrets
 
+install-devel:
+       cd pppd; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) INCDIR=$(INCDIR) $(MFLAGS) install-devel
+
 $(ETCDIR)/options:
        $(INSTALL) -c -m 644 etc.ppp/options $@
 $(ETCDIR)/pap-secrets:

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 5b2f6950bd5a5838571c69be95c5b445e05dd96a..7a8483677073367bffb948e264d644477f002459 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,17 +1,21 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.49 2002/06/01 08:47:03 mjb Exp $
+# $Id: Makefile.linux,v 1.50 2002/06/10 13:46:28 dfs Exp $
 #
 
 # Default installation locations
 BINDIR = /usr/sbin
 MANDIR = /usr/man
+INCDIR = /usr/include
 
 PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c ecp.c \
           ipxcp.c auth.c options.c sys-linux.c md4.c chap_ms.c cbcp.c \
           demand.c utils.c tty.c sha1.c
-HEADERS =  callout.h pathnames.h patchlevel.h chap.h md5.h chap_ms.h md4.h \
-          ipxcp.h cbcp.h tdb.h sha1.h
+
+HEADERS = cbcp.h ccp.h chap.h chap_ms.h ecp.h fsm.h ipcp.h \
+       ipxcp.h lcp.h magic.h md4.h md5.h patchlevel.h pathnames.h pppd.h \
+       sha1.h tdb.h upap.h
+
 MANPAGES = pppd.8
 PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o ccp.o ecp.o \
           auth.o options.o demand.o utils.o sys-linux.o ipxcp.o tty.o sha1.o
@@ -162,6 +166,10 @@ install: pppd
 pppd: $(PPPDOBJS)
        $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
 
+install-devel:
+       mkdir -p $(INCDIR)/pppd
+       $(INSTALL) -c -m 644 $(HEADERS) $(INCDIR)/pppd
+
 clean:
        rm -f $(PPPDOBJS) pppd *~ #* core