Fix an fd leak on the discovery socket.

[ppp.git] / pppd / plugins / Makefile.linux

diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
index 971024af5665901c4feb1c050c07c77e756c67f4..80b0ae01da8a07566fe3729b0855e4e046ad6f5a 100644 (file)
--- a/pppd/plugins/Makefile.linux
+++ b/pppd/plugins/Makefile.linux
@@ -1,10 +1,18 @@
 CC     = gcc
-CFLAGS = -g -O2 -I.. -I../../include -fPIC
+COPTS  = -O2 -g
+CFLAGS = $(COPTS) -I.. -I../../include -fPIC
 LDFLAGS        = -shared
-INSTALL        = install -o root
+INSTALL        = install
 
-SUBDIRS = rp-pppoe radius
-PLUGINS = minconn.so passprompt.so passwordfd.so
+DESTDIR = @DESTDIR@
+BINDIR = $(DESTDIR)/sbin
+MANDIR = $(DESTDIR)/share/man/man8
+LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+
+SUBDIRS := rp-pppoe
+# Uncomment the next line to include the radius authentication plugin
+# SUBDIRS += radius
+PLUGINS := minconn.so passprompt.so passwordfd.so
 
 # include dependencies if present
 ifeq (.depend,$(wildcard .depend))
@@ -18,13 +26,11 @@ all:        $(PLUGINS)
        $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
 
 VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
-LIBDIR = $(DESTDIR)/usr/lib/pppd/$(VERSION)
 
 install: $(PLUGINS)
        $(INSTALL) -d $(LIBDIR)
        $(INSTALL) $? $(LIBDIR)
-       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d INSTALL=$(INSTALL) \
-                               LIBDIR=$(LIBDIR) install; done
+       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install; done
 
 clean:
        rm -f *.o *.so *.a