Honor LDFLAGS

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

diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
index 971024af5665901c4feb1c050c07c77e756c67f4..af5384381cb07c27fa4043824f80b6ab69807fa9 100644 (file)
--- a/pppd/plugins/Makefile.linux
+++ b/pppd/plugins/Makefile.linux
@@ -1,10 +1,25 @@
-CC     = gcc
-CFLAGS = -g -O2 -I.. -I../../include -fPIC
-LDFLAGS        = -shared
-INSTALL        = install -o root
-
-SUBDIRS = rp-pppoe radius
-PLUGINS = minconn.so passprompt.so passwordfd.so
+#CC    = gcc
+COPTS  = -O2 -g
+CFLAGS = $(COPTS) -I.. -I../../include -fPIC
+LDFLAGS_SHARED = -shared
+INSTALL        = install
+
+DESTDIR = $(INSTROOT)@DESTDIR@
+BINDIR = $(DESTDIR)/sbin
+MANDIR = $(DESTDIR)/share/man/man8
+LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+
+SUBDIRS := rp-pppoe pppoatm pppol2tp
+# Uncomment the next line to include the radius authentication plugin
+SUBDIRS += radius
+PLUGINS := minconn.so passprompt.so passwordfd.so winbind.so
+
+# This setting should match the one in ../Makefile.linux
+MPPE=y
+
+ifdef MPPE
+CFLAGS   += -DMPPE=1
+endif
 
 # include dependencies if present
 ifeq (.depend,$(wildcard .depend))
@@ -12,24 +27,22 @@ include .depend
 endif
 
 all:   $(PLUGINS)
-       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done
+       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all || exit $$?; done
 
 %.so: %.c
-       $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
+       $(CC) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) $(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 || exit $$?; done
 
 clean:
        rm -f *.o *.so *.a
-       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean; done
+       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean || exit $$?; done
 
 depend:
        $(CPP) -M $(CFLAGS) *.c >.depend
-       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend; done
+       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend || exit $$?; done