ppp/trunk/ppp-2.4.6-makefiles.patch

   1 diff -Nur ppp-2.4.6.orig/chat/Makefile.linux ppp-2.4.6/chat/Makefile.linux
   2 --- ppp-2.4.6.orig/chat/Makefile.linux  2014-01-02 05:42:08.000000000 +0100
   3 +++ ppp-2.4.6/chat/Makefile.linux       2014-02-24 09:00:16.666577906 +0100
   4 @@ -3,7 +3,7 @@
   5  COPTS=@CFLAGS@
   6
   7  DESTDIR = $(INSTROOT)@DESTDIR@
   8 -BINDIR = $(DESTDIR)/sbin
   9 +BINDIR = $(DESTDIR)/bin
  10  MANDIR = $(DESTDIR)/share/man/man8
  11
  12  CDEF1= -DTERMIOS                       # Use the termios structure
  13 diff -Nur ppp-2.4.6.orig/linux/Makefile.top ppp-2.4.6/linux/Makefile.top
  14 --- ppp-2.4.6.orig/linux/Makefile.top   2014-01-02 05:42:08.000000000 +0100
  15 +++ ppp-2.4.6/linux/Makefile.top        2014-02-24 09:00:16.743242620 +0100
  16 @@ -1,7 +1,7 @@
  17  # PPP top-level Makefile for Linux.
  18
  19  DESTDIR = $(INSTROOT)@DESTDIR@
  20 -BINDIR = $(DESTDIR)/sbin
  21 +BINDIR = $(DESTDIR)/bin
  22  INCDIR = $(DESTDIR)/include
  23  MANDIR = $(DESTDIR)/share/man
  24  ETCDIR = $(INSTROOT)@SYSCONF@/ppp
  25 diff -Nur ppp-2.4.6.orig/pppd/Makefile.linux ppp-2.4.6/pppd/Makefile.linux
  26 --- ppp-2.4.6.orig/pppd/Makefile.linux  2014-01-02 05:42:08.000000000 +0100
  27 +++ ppp-2.4.6/pppd/Makefile.linux       2014-02-24 09:00:16.743242620 +0100
  28 @@ -9,7 +9,7 @@
  29
  30  # Default installation locations
  31  DESTDIR = $(INSTROOT)@DESTDIR@
  32 -BINDIR = $(DESTDIR)/sbin
  33 +BINDIR = $(DESTDIR)/bin
  34  MANDIR = $(DESTDIR)/share/man/man8
  35  INCDIR = $(DESTDIR)/include
  36
  37 diff -Nur ppp-2.4.6.orig/pppd/plugins/Makefile.linux ppp-2.4.6/pppd/plugins/Makefile.linux
  38 --- ppp-2.4.6.orig/pppd/plugins/Makefile.linux  2014-01-02 05:42:08.000000000 +0100
  39 +++ ppp-2.4.6/pppd/plugins/Makefile.linux       2014-02-24 09:00:16.779908379 +0100
  40 @@ -3,7 +3,7 @@
  41  COPTS=@CFLAGS@
  42
  43  DESTDIR = $(INSTROOT)@DESTDIR@
  44 -BINDIR = $(DESTDIR)/sbin
  45 +BINDIR = $(DESTDIR)/bin
  46  MANDIR = $(DESTDIR)/share/man/man8
  47  LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
  48
  49 diff -Nur ppp-2.4.6.orig/pppd/plugins/pppoe/Makefile.linux ppp-2.4.6/pppd/plugins/pppoe/Makefile.linux
  50 --- ppp-2.4.6.orig/pppd/plugins/pppoe/Makefile.linux    2014-01-02 05:42:08.000000000 +0100
  51 +++ ppp-2.4.6/pppd/plugins/pppoe/Makefile.linux 2014-02-24 09:00:16.809907637 +0100
  52 @@ -17,7 +17,7 @@
  53  COPTS=@CFLAGS@
  54
  55  DESTDIR = $(INSTROOT)@DESTDIR@
  56 -BINDIR = $(DESTDIR)/sbin
  57 +BINDIR = $(DESTDIR)/bin
  58  LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
  59
  60  PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  61 diff -Nur ppp-2.4.6.orig/pppdump/Makefile.linux ppp-2.4.6/pppdump/Makefile.linux
  62 --- ppp-2.4.6.orig/pppdump/Makefile.linux       2014-01-02 05:42:08.000000000 +0100
  63 +++ ppp-2.4.6/pppdump/Makefile.linux    2014-02-24 09:00:16.809907637 +0100
  64 @@ -3,7 +3,7 @@
  65  COPTS=@CFLAGS@
  66
  67  DESTDIR = $(INSTROOT)@DESTDIR@
  68 -BINDIR = $(DESTDIR)/sbin
  69 +BINDIR = $(DESTDIR)/bin
  70  MANDIR = $(DESTDIR)/share/man/man8
  71
  72  CFLAGS = $(COPTS) -I../include/net
  73 diff -Nur ppp-2.4.6.orig/pppstats/Makefile.linux ppp-2.4.6/pppstats/Makefile.linux
  74 --- ppp-2.4.6.orig/pppstats/Makefile.linux      2014-01-02 05:42:08.000000000 +0100
  75 +++ ppp-2.4.6/pppstats/Makefile.linux   2014-02-24 09:00:16.809907637 +0100
  76 @@ -6,7 +6,7 @@
  77  COPTS=@CFLAGS@
  78
  79  DESTDIR = $(INSTROOT)@DESTDIR@
  80 -BINDIR = $(DESTDIR)/sbin
  81 +BINDIR = $(DESTDIR)/bin
  82  MANDIR = $(DESTDIR)/share/man/man8
  83
  84  PPPSTATSRCS = pppstats.c
  85