[gnome-continuous] Update ppp-destdir patch



commit fa947e745310a44a26f1f661619eea1272f39b15
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sat Jun 23 16:32:33 2018 +0100

    Update ppp-destdir patch
    
    We need to propagate DESTDIR when recursively install.

 patches/ppp-destdir.patch | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/patches/ppp-destdir.patch b/patches/ppp-destdir.patch
index 7025e0c..ac39228 100644
--- a/patches/ppp-destdir.patch
+++ b/patches/ppp-destdir.patch
@@ -1,4 +1,4 @@
-From 972246d992f00e89a3aa22b14535af4db069be7e Mon Sep 17 00:00:00 2001
+From b3c50a3745c13aed04d1df80d4ce2528b30eb50a Mon Sep 17 00:00:00 2001
 From: Emmanuele Bassi <ebassi gnome org>
 Date: Sat, 23 Jun 2018 13:50:58 +0100
 Subject: [PATCH] build: Use DESTDIR= like automake, not like --prefix
@@ -12,6 +12,9 @@ DESTDIR, and ./configure --prefix replaces what was formerly DESTDIR.
 
 Original patch by: Colin Walters <walters verbum org>
 
+v3:
+ - Propagate DESTDIR when recursing
+
 v2:
  - Update after changes in pppd
 ---
@@ -20,14 +23,14 @@ v2:
  linux/Makefile.top                   | 22 +++++++++++-----------
  pppd/Makefile.linux                  | 20 ++++++++++----------
  pppd/pathnames.h                     |  2 +-
- pppd/plugins/Makefile.linux          | 12 ++++++------
+ pppd/plugins/Makefile.linux          | 14 +++++++-------
  pppd/plugins/pppoatm/Makefile.linux  |  8 ++++----
  pppd/plugins/pppol2tp/Makefile.linux |  8 ++++----
  pppd/plugins/radius/Makefile.linux   | 18 +++++++++---------
  pppd/plugins/rp-pppoe/Makefile.linux | 14 +++++++-------
  pppdump/Makefile.linux               | 12 ++++++------
  pppstats/Makefile.linux              | 12 ++++++------
- 12 files changed, 73 insertions(+), 73 deletions(-)
+ 12 files changed, 74 insertions(+), 74 deletions(-)
 
 diff --git a/chat/Makefile.linux b/chat/Makefile.linux
 index 0732ec8..909c3db 100644
@@ -203,7 +206,7 @@ index a33f046..abb8d76 100644
  #define _PATH_PLUGIN  "/usr/lib/pppd"
  #endif /* __STDC__ */
 diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
-index af53843..cd797e4 100644
+index af53843..4a5fb79 100644
 --- a/pppd/plugins/Makefile.linux
 +++ b/pppd/plugins/Makefile.linux
 @@ -4,10 +4,10 @@ CFLAGS       = $(COPTS) -I.. -I../../include -fPIC
@@ -221,17 +224,19 @@ index af53843..cd797e4 100644
  
  SUBDIRS := rp-pppoe pppoatm pppol2tp
  # Uncomment the next line to include the radius authentication plugin
-@@ -35,8 +35,8 @@ all: $(PLUGINS)
+@@ -35,9 +35,9 @@ all: $(PLUGINS)
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
  
  install: $(PLUGINS)
 -      $(INSTALL) -d $(LIBDIR)
 -      $(INSTALL) $? $(LIBDIR)
+-      for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install || exit $$?; done
 +      $(INSTALL) -d $(DESTDIR)$(LIBDIR)
 +      $(INSTALL) $? $(DESTDIR)$(LIBDIR)
-       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install || exit $$?; done
++      for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) -C $$d install || exit $$?; done
  
  clean:
+       rm -f *.o *.so *.a
 diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
 index 59dde0e..a75999a 100644
 --- a/pppd/plugins/pppoatm/Makefile.linux


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]