X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2FMakefile.linux;h=852945e8958edd2e607519ad6a7dc0cfe1cb23e2;hb=93fd8a0916ef6bc2a33b76bf165a847355343693;hp=c3489fb5dbf06673ad849ee6a62eb3d1982892ac;hpb=5191399f5266bb595f03f5c4fee13153092e2baf;p=ppp.git

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index c3489fb..852945e 100644
--- 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
 
@@ -106,6 +109,8 @@ CFLAGS   += -DMSLANMAN=1
 endif
 ifdef MPPE
 CFLAGS   += -DMPPE=1
+PPPDOBJS += mppe.o
+PPPDSRC  += mppe.c
 HEADERS  += mppe.h
 endif
 endif
@@ -157,7 +162,6 @@ endif
 
 ifdef NEEDDES
 ifndef USE_CRYPT
-CFLAGS   += -I$(shell $(CC) --print-sysroot)/usr/include/openssl
 NEEDCRYPTOLIB = y
 else
 CFLAGS   += -DUSE_CRYPT=1
@@ -239,11 +243,14 @@ INSTALL= install
 all: $(TARGETS)
 
 install: pppd
-	mkdir -p $(BINDIR) $(MANDIR)
+	$(INSTALL) -d $(BINDIR)
+	$(INSTALL) -d $(MANDIR)
+	$(INSTALL) -d $(PKGCONFDIR)
 	$(EXTRAINSTALL)
 	$(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 644 pppd.pc $(PKGCONFDIR)
 	$(INSTALL) -c -m 644 pppd.8 $(MANDIR)
 
 pppd: $(PPPDOBJS)