[gnome-continuous] Fix ppp-destdir patch
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] Fix ppp-destdir patch
- Date: Sat, 23 Jun 2018 22:09:53 +0000 (UTC)
commit 72dc23f3eb11ff9d5ebaae66cbcc7462453a2996
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sat Jun 23 23:09:23 2018 +0100
Fix ppp-destdir patch
patches/ppp-destdir.patch | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/patches/ppp-destdir.patch b/patches/ppp-destdir.patch
index ac39228..4a1873d 100644
--- a/patches/ppp-destdir.patch
+++ b/patches/ppp-destdir.patch
@@ -1,4 +1,4 @@
-From b3c50a3745c13aed04d1df80d4ce2528b30eb50a Mon Sep 17 00:00:00 2001
+From 28fd0a50ee675123fecf0487978961ae3800ec7c 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>
+v4:
+ - Fix install rule in pppoatm
+
v3:
- Propagate DESTDIR when recursing
@@ -238,7 +241,7 @@ index af53843..4a5fb79 100644
clean:
rm -f *.o *.so *.a
diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
-index 59dde0e..a75999a 100644
+index 59dde0e..72a6cd6 100644
--- a/pppd/plugins/pppoatm/Makefile.linux
+++ b/pppd/plugins/pppoatm/Makefile.linux
@@ -6,8 +6,8 @@ INSTALL = install
@@ -259,7 +262,7 @@ index 59dde0e..a75999a 100644
- $(INSTALL) -d -m 755 $(LIBDIR)
- $(INSTALL) -c -m 4550 $(PLUGIN) $(LIBDIR)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)
-+ $(INSTALL) -c -m 4550 $(DESTDIR)$(PLUGIN) $(DESTDIR)$(LIBDIR)
++ $(INSTALL) -c -m 4550 $(PLUGIN) $(DESTDIR)$(LIBDIR)
clean:
rm -f *.o *.so
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]